update

jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/basePage.vue

@@ -218,85 +218,43 @@
         </el-col>
 
         <el-col :span="8">
-          <el-form-item label="单位性质" prop="natureOfUnit">
+          <el-form-item label="单位性质" prop="unitNature">
-            <el-input
+            <el-input v-model="form.unitNature" placeholder="请输入单位性质" />
-              v-model="form.natureOfUnit"
-              placeholder="请输入单位性质"
-            />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="营业执照信息" prop="businessLicense">
-            <el-input
-              v-model="form.businessLicense"
-              placeholder="请输入营业执照信息"
-            />
           </el-form-item>
         </el-col>
 
         <el-col :span="8">
           <el-form-item label="营业期限" prop="businessTerm">
-            <el-input
+            <el-date-picker
               v-model="form.businessTerm"
-              placeholder="请输入营业期限"
+              type="date"
-            />
+              placeholder="选择营业期限"
+              value-format="yyyy-MM-dd"
+            >
+            </el-date-picker>
           </el-form-item>
         </el-col>
 
         <el-col :span="8">
-          <el-form-item label="企业经理信息" prop="businessManager">
+          <el-form-item
+            label="企业经理信息"
+            prop="enterpriseManagerInformation"
+          >
             <el-input
-              v-model="form.BusinessManager"
+              v-model="form.enterpriseManagerInformation"
               placeholder="请输入企业经理信息"
             />
           </el-form-item>
         </el-col>
 
-        <el-col :span="8">
-          <el-form-item label="技术负责人信息" prop="technicalLeader">
-            <el-input
-              v-model="form.technicalLeader"
-              placeholder="请输入技术负责人信息"
-            />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="统计证信息" prop="statisticalCertificate">
-            <el-input
-              v-model="form.statisticalCertificate"
-              placeholder="请输入统计证信息"
-            />
-          </el-form-item>
-        </el-col>
-
         <el-col :span="8">
           <el-form-item
-            label="安全生产许可证信息"
+            label="技术负责人信息"
-            prop="safetyProductionLicense"
+            prop="technicalManagerInformation"
           >
             <el-input
-              v-model="form.safetyProductionLicense"
+              v-model="form.technicalManagerInformation"
-              placeholder="请输入安全生产许可证信息"
+              placeholder="请输入技术负责人信息"
-            />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="银行开户许可证信息" prop="bankAccountPermit">
-            <el-input
-              v-model="form.bankAccountPermit"
-              placeholder="请输入银行开户许可证信息"
-            />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="工商年检结果" prop="iannualInspect">
-            <el-input
-              v-model="form.iannualInspect"
-              placeholder="请输入工商年检结果"
             />
           </el-form-item>
         </el-col>
@@ -310,28 +268,17 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="8">
-          <el-form-item label="单位名称变更信息" prop="unitNameChange">
-            <el-input
-              v-model="form.unitNameChange"
-              placeholder="请输入单位名称变更信息"
-            />
-          </el-form-item>
-        </el-col>
-
         <el-col :span="24">
-          <el-form-item label="企业简介" prop="enterpriseProfile">
+          <el-form-item label="单位名称变更信息" prop="cnameInformation">
             <el-input
-              v-model="form.enterpriseProfile"
+              v-model="form.cnameInformation"
-              placeholder="请输入企业简介"
+              placeholder="请输入单位名称变更信息"
-              type="textarea"
-              rows="4"
             />
           </el-form-item>
         </el-col>
 
         <el-col :span="12">
-          <el-form-item label="备注" prop="remark">
+          <el-form-item label="企业简介" prop="remark">
             <el-input
               v-model="form.remark"
               placeholder="请输入备注"
@@ -411,6 +358,114 @@
             </el-upload>
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item label="银行开户许可证信息" prop="permitInformation">
+            <el-upload
+              class="upload-demo"
+              action="thinking/common/upload"
+              :headers="headers"
+              :before-upload="(file) => $fileBeforeUpload(file, 'fileList3')"
+              :on-preview="handleOpinionPreview"
+              :on-remove="(file) => handleOpinionRemove(file, 'fileList3')"
+              :before-remove="beforeOpinionRemove"
+              multiple
+              :on-exceed="handleOpinionExceed"
+              :on-success="
+                (_, fileList) => submitOpinionUpload(fileList, 'fileList3')
+              "
+              :file-list="fileList3"
+            >
+              <el-button size="small" type="primary" plain>
+                <i class="el-icon-upload el-icon--right"></i>
+                点击上传
+              </el-button>
+              <div slot="tip" class="el-upload__tip">
+                支持jpg/png/pdf/word/excel文件等，不超过200M
+              </div>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="工商年检结果" prop="icResults">
+            <el-upload
+              class="upload-demo"
+              action="thinking/common/upload"
+              :headers="headers"
+              :before-upload="(file) => $fileBeforeUpload(file, 'fileList4')"
+              :on-preview="handleOpinionPreview"
+              :on-remove="(file) => handleOpinionRemove(file, 'fileList4')"
+              :before-remove="beforeOpinionRemove"
+              multiple
+              :on-exceed="handleOpinionExceed"
+              :on-success="
+                (_, fileList) => submitOpinionUpload(fileList, 'fileList4')
+              "
+              :file-list="fileList4"
+            >
+              <el-button size="small" type="primary" plain>
+                <i class="el-icon-upload el-icon--right"></i>
+                点击上传
+              </el-button>
+              <div slot="tip" class="el-upload__tip">
+                支持jpg/png/pdf/word/excel文件等，不超过200M
+              </div>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="统计证信息" prop="certificateInformation">
+            <el-upload
+              class="upload-demo"
+              action="thinking/common/upload"
+              :headers="headers"
+              :before-upload="(file) => $fileBeforeUpload(file, 'fileList5')"
+              :on-preview="handleOpinionPreview"
+              :on-remove="(file) => handleOpinionRemove(file, 'fileList5')"
+              :before-remove="beforeOpinionRemove"
+              multiple
+              :on-exceed="handleOpinionExceed"
+              :on-success="
+                (_, fileList) => submitOpinionUpload(fileList, 'fileList5')
+              "
+              :file-list="fileList5"
+            >
+              <el-button size="small" type="primary" plain>
+                <i class="el-icon-upload el-icon--right"></i>
+                点击上传
+              </el-button>
+              <div slot="tip" class="el-upload__tip">
+                支持jpg/png/pdf/word/excel文件等，不超过200M
+              </div>
+            </el-upload>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="营业执照信息" prop="licenseInformation">
+            <el-upload
+              class="upload-demo"
+              action="thinking/common/upload"
+              :headers="headers"
+              :before-upload="(file) => $fileBeforeUpload(file, 'fileList6')"
+              :on-preview="handleOpinionPreview"
+              :on-remove="(file) => handleOpinionRemove(file, 'fileList6')"
+              :before-remove="beforeOpinionRemove"
+              multiple
+              :on-exceed="handleOpinionExceed"
+              :on-success="
+                (_, fileList) => submitOpinionUpload(fileList, 'fileList6')
+              "
+              :file-list="fileList6"
+            >
+              <el-button size="small" type="primary" plain>
+                <i class="el-icon-upload el-icon--right"></i>
+                点击上传
+              </el-button>
+              <div slot="tip" class="el-upload__tip">
+                支持jpg/png/pdf/word/excel文件等，不超过200M
+              </div>
+            </el-upload>
+          </el-form-item>
+        </el-col>
       </el-form>
     </el-row>
     <div class="btnList">
@@ -612,6 +667,10 @@ export default {
       },
       fileList1: [],
       fileList2: [],
+      fileList3: [],
+      fileList4: [],
+      fileList5: [],
+      fileList6: [],
       // 企业资质字典
       enterpriseTypeOptions: [],
     };

jwtech-admin-page/src/views/projectStatistics/projectProcess/qualityControl/options/components/divAssess.vue

@@ -34,11 +34,23 @@
         min-width="120"
       />
       <el-table-column
-        label="单元工程优良率"
+        label="单元工程优良率(%)"
         align="center"
         prop="cellProjectRate"
         min-width="120"
       />
+      <el-table-column
+        label="关键部位单元优良率(%)"
+        align="center"
+        prop="keyComponentUnits"
+        min-width="150"
+      />
+      <el-table-column
+        label="重要隐藏单元优良率(%)"
+        align="center"
+        prop="hiddenComponentRate"
+        min-width="150"
+      />
       <!-- <el-table-column
         label="关键部位和重要隐藏单元优良率"
         align="center"