合同及客户修改

src/views/common/UpLoadComponent.vue

@@ -1,7 +1,7 @@
 <!--文件上传组件-->
 <template>
   <div>
-    <el-divider content-position="left"><i class="el-icon-document"></i> 附件</el-divider>
+    <el-divider content-position="left"><i class="el-icon-document"></i> {{dividerName}}</el-divider>
     <el-upload ref="upload" style="display: inline-block; :show-header='status'" action=""
                :limit="999" :http-request="httpRequest"
                multiple
@@ -114,6 +114,8 @@
        *    注：值为空时，默认存放到"public"文件夹
        * @param maxValue  上传文件允许的最大值，单位：MB
        *    注：值为空时，默认值为300MB
+       * @param dividerName  组件中divider的名称
+       *    注：值为空时，默认值为‘附件’
        */
       async newUpload (auth, fileList, directory, maxValue, dividerName) {
         await this.fileLoadingFalse()

src/views/modules/program/registered/ProjectForm.vue

@@ -115,9 +115,8 @@
           <el-col :span="12">
             <el-form-item label="立项号" prop="approvalNo"
                           :rules="[
-                          {required: true, message:'立项号不能为空', trigger:'blur'}
                  ]">
-              <el-input maxlength="64" max v-model="inputForm.approvalNo" placeholder="请输入立项号"clearable></el-input>
+              <el-input :disabled="true" maxlength="64" max v-model="inputForm.approvalNo" placeholder="请输入立项号"clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -1041,41 +1040,6 @@
         }
         this.$forceUpdate()
       },
-      openContactForm (deputy) {
-        if (deputy === '0') {
-          if (this.commonJS.isEmpty(this.inputForm.client)) {
-            this.$message.error('请先填写委托方')
-          } else {
-            this.$refs.contactForm.init(this.inputForm.client, deputy)
-          }
-        }
-        if (deputy === '2') {
-          if (this.commonJS.isEmpty(this.inputForm.propertyHolder)) {
-            this.$message.error('请先填写产权持有人')
-          } else {
-            this.$refs.contactForm.init(this.inputForm.propertyHolder, deputy)
-          }
-        }
-        if (deputy === '3') {
-          if (this.commonJS.isEmpty(this.inputForm.assessmentEnterprise)) {
-            this.$message.error('请先填写被评估企业')
-          } else {
-            this.$refs.contactForm.init(this.inputForm.assessmentEnterprise, deputy)
-          }
-        }
-      },
-      getContact (rows, deputy) {
-        if (deputy === '0') {
-          this.inputForm.clientList = rows
-        }
-        if (deputy === '2') {
-          this.inputForm.equityList = rows
-        }
-        if (deputy === '3') {
-          this.inputForm.contactList = rows
-        }
-        this.$forceUpdate()
-      },
       close () {
         this.inputForm.clientList = []
         this.inputForm.equityList = []

src/views/modules/program/registered/RegisItemForm.vue

@@ -107,9 +107,8 @@
           <el-col :span="12">
             <el-form-item label="立项号" prop="approvalNo"
                           :rules="[
-                          {required: true, message:'立项号不能为空', trigger:'blur'}
                  ]">
-              <el-input maxlength="64" max v-model="inputForm.approvalNo" placeholder="请输入立项号"clearable></el-input>
+              <el-input maxlength="64" :disabled="true" v-model="inputForm.approvalNo" placeholder="请输入立项号"clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">

src/views/modules/sys/workClient/WorkClientForm.vue

@@ -210,7 +210,7 @@
           </el-input>
         </el-form-item>
 
-        <el-form-item label="开户行信息" prop="bankInfos">
+        <el-form-item label="开票信息" prop="bankInfos">
           <vxe-toolbar>
             <template #buttons>
               <vxe-button status="primary" :disabled="method==='view'" size="mini" @click="insertEvent('bank')">新增</vxe-button>
@@ -720,34 +720,34 @@
             this.linkmanInfos.forEach((item) => {
               this.inputForm.workClientLinkman.push(item)
             })
-            if (this.inputForm.workClientBank.length === 0) {
-              this.$message.error('开户行信息至少填写一条')
-              this.loading = false
-              return
-            } else {
-              let flag = true
-              this.inputForm.workClientBank.forEach(item => {
-                if (item.ourBank === null || item.ourBank === undefined || item.ourBank === '') {
-                  this.$message.error('开户银行未填写')
-                  this.loading = false
-                  flag = false
-                  return
-                } else if (item.bankNumber === null || item.bankNumber === undefined || item.bankNumber === '') {
-                  this.$message.error('开户账号未填写')
-                  this.loading = false
-                  flag = false
-                  return
-                }
-                if (!this.validateXG.isBankNumber(item.bankNumber)) {
-                  this.$message.error('请输入正确的开户行账号')
-                  this.loading = false
-                  flag = false
-                }
-              })
-              if (flag === false) {
+            // if (this.inputForm.workClientBank.length === 0) {
+            //   this.$message.error('开户行信息至少填写一条')
+            //   this.loading = false
+            //   return
+            // } else {
+            let flag = true
+            this.inputForm.workClientBank.forEach(item => {
+              if (item.ourBank === null || item.ourBank === undefined || item.ourBank === '') {
+                this.$message.error('开户银行未填写')
+                this.loading = false
+                flag = false
+                return
+              } else if (item.bankNumber === null || item.bankNumber === undefined || item.bankNumber === '') {
+                this.$message.error('开户账号未填写')
+                this.loading = false
+                flag = false
                 return
               }
+              if (!this.validateXG.isBankNumber(item.bankNumber)) {
+                this.$message.error('请输入正确的开户行账号')
+                this.loading = false
+                flag = false
+              }
+            })
+            if (flag === false) {
+              return
             }
+            // }
             if (this.inputForm.workClientLinkman.length === 0) {
               this.$message.error('联系人信息至少填写一条')
               this.loading = false

src/views/modules/sys/workContract/WorkContractFileForm.vue

@@ -139,26 +139,6 @@
 
       <el-row></el-row>
 
-      <el-form-item label="描述内容" prop="describes">
-        <el-input v-model="inputForm.describes"
-                  type="textarea"
-                  :rows="5"
-                  maxlength="500"
-                  placeholder="请输入描述内容"
-                  show-word-limit>
-        </el-input>
-      </el-form-item>
-
-      <el-form-item label="合同特别条款" prop="contractSpecial">
-        <el-input v-model="inputForm.contractSpecial"
-                  type="textarea"
-                  :rows="5"
-                  maxlength="500"
-                  placeholder="请输入合同特别条款"
-                  show-word-limit>
-        </el-input>
-      </el-form-item>
-
       <el-form-item label="备注" prop="remarks">
         <el-input v-model="inputForm.remarks"
                   type="textarea"
@@ -456,7 +436,7 @@
                 })
               }
               this.inputForm.contractFees = f
-              this.$refs.uploadComponent.newUpload(method, this.inputForm.workAttachmentList, 'workContract')
+              this.$refs.uploadComponent.newUpload(method, this.inputForm.workAttachmentList, 'workContract', 300, '合同文本、补充协议')
               this.loading = false
             })
           }

src/views/modules/sys/workContract/WorkContractForm.vue

@@ -139,26 +139,6 @@
 
       <el-row></el-row>
 
-      <el-form-item label="描述内容" prop="describes">
-        <el-input v-model="inputForm.describes"
-                  type="textarea"
-                  :rows="5"
-                  maxlength="500"
-                  placeholder="请输入描述内容"
-                  show-word-limit>
-        </el-input>
-      </el-form-item>
-
-      <el-form-item label="合同特别条款" prop="contractSpecial">
-        <el-input v-model="inputForm.contractSpecial"
-                  type="textarea"
-                  :rows="5"
-                  maxlength="500"
-                  placeholder="请输入合同特别条款"
-                  show-word-limit>
-        </el-input>
-      </el-form-item>
-
       <el-form-item label="备注" prop="remarks">
         <el-input v-model="inputForm.remarks"
                   type="textarea"
@@ -388,7 +368,7 @@
                 })
               }
               this.inputForm.contractFees = f
-              this.$refs.uploadComponent.newUpload(method, this.inputForm.workAttachmentList, 'workContract')
+              this.$refs.uploadComponent.newUpload(method, this.inputForm.workAttachmentList, 'workContract', 300, '合同文本、补充协议')
               this.loading = false
             })
           }

src/views/modules/sys/workContract/WorkContractForm2.vue

@@ -141,23 +141,6 @@
 
           <el-row></el-row>
 
-          <el-form-item label="描述内容" prop="describes">
-            <el-input v-model="inputForm.describes"
-                      type="textarea"
-                      :rows="5"
-                      placeholder="请输入描述内容"
-                      show-word-limit>
-            </el-input>
-          </el-form-item>
-
-          <el-form-item label="合同特别条款" prop="contractSpecial">
-            <el-input v-model="inputForm.contractSpecial"
-                      type="textarea"
-                      :rows="5"
-                      placeholder="请输入合同特别条款"
-                      show-word-limit>
-            </el-input>
-          </el-form-item>
 
           <el-form-item label="备注" prop="remarks">
             <el-input v-model="inputForm.remarks"
@@ -362,7 +345,7 @@
                 })
               }
               this.inputForm.contractFees = f
-              this.$refs.uploadComponent.newUpload(method, this.inputForm.workAttachmentList, 'workContract')
+              this.$refs.uploadComponent.newUpload(method, this.inputForm.workAttachmentList, 'workContract', 300, '合同文本、补充协议')
             })
           }
           this.loading = false