Merge remote-tracking branch 'origin/master'

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

@@ -174,7 +174,7 @@
             <el-col :span="12">
               <el-form-item label="司法鉴定" prop="forensics"
                             :rules="[
-                        {required: true, message:'司法鉴定不能为空', trigger:'blur'}
+                        { message:'司法鉴定不能为空', trigger:'blur'}
                  ]">
                 <el-input v-model="inputForm.forensics" maxlength="64" placeholder="请填写司法鉴定"    clearable ></el-input>
               </el-form-item>

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

@@ -22,8 +22,8 @@
           :accordion="true"
           @getValue="(value) => {searchForm.createBy=value}"/>
       </el-form-item>
-      <el-form-item label="项目经理" prop="projectManagerName">
-        <el-input size="small" v-model="searchForm.projectManagerName" placeholder="请输入项目经理" clearable></el-input>
+      <el-form-item label="项目负责人" prop="projectManagerName">
+        <el-input size="small" v-model="searchForm.projectManagerName" placeholder="请输入项目负责人" clearable></el-input>
       </el-form-item>
       <el-form-item label="合同名称" prop="contractName">
         <el-input size="small" v-model="searchForm.contractName" placeholder="请输入合同名称" clearable></el-input>
@@ -103,7 +103,7 @@
               <span v-else>{{scope.row.name}}</span>
             </template>
           </vxe-column>
-          <vxe-column min-width="100"align="center" title="项目经理" field="projectManagerName"></vxe-column>
+          <vxe-column min-width="100"align="center" title="项目负责人" field="projectManagerName"></vxe-column>
           <vxe-column min-width="180"align="center" title="委托方" field="clientName"></vxe-column>
           <vxe-column min-width="210"align="center" title="报告号" field="reportNo"></vxe-column>
           <vxe-column min-width="120"align="center" title="创建日期" field="createDate"></vxe-column>

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

@@ -231,12 +231,12 @@
           :edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true}"
         >
 
-          <vxe-table-column field="ourBank" title="开户银行" :edit-render="{}">
+          <vxe-table-column field="ourBank" title="开票银行" :edit-render="{}">
             <template v-slot:edit="scope" >
               <el-input maxlength="64" v-model="scope.row.ourBank" ></el-input>
             </template>
           </vxe-table-column>
-          <vxe-table-column field="bankNumber" title="开户账号" :edit-render="{}">
+          <vxe-table-column field="bankNumber" title="开票账号" :edit-render="{}">
             <template v-slot:edit="scope" >
               <el-input v-model="scope.row.bankNumber" maxlength="20"></el-input>
             </template>