Merge branch 'master' of http://git.excellentkk.cn/mkm/TaskSystem-admin

src/views/company/index.vue

@@ -231,14 +231,12 @@
                     >生成合同</el-button
                   >
                   <el-button
-                    v-if="
-                      Array.isArray(row.contract) && row.contract.length == 0
-                    "
+                    v-else-if="row.contract?.check_status == 1"
                     v-perms="['company/initiate_contract']"
                     type="warning"
                     link
-                    @click="showChangeCompany(row)"
-                    >生成合同</el-button
+                    @click="auditing"
+                    >审核中</el-button
                   >
                   <el-button
                     v-else-if="row.contract?.check_status == 2"
@@ -551,6 +549,11 @@ const handleAuthentication = async (id: number | any[]) => {
   getLists();
 };
 
+// 审核中
+const auditing = () => {
+  ElMessage.warning("请等待合同审核完成!");
+};
+
 getLists();
 </script>
 <style lang="scss">

src/views/contract/contractDetil.vue

@@ -56,7 +56,11 @@
         <el-select disabled v-model="compeny.area_name" placeholder="请选择区">
         </el-select>
       </el-form-item>
-      <el-form-item label="镇" prop="company_type_name">
+      <el-form-item
+        label="镇"
+        v-if="compeny.company_type != 30"
+        prop="company_type_name"
+      >
         <el-select
           disabled
           v-model="compeny.street_name"
@@ -64,7 +68,11 @@
         >
         </el-select>
       </el-form-item>
-      <el-form-item label="地址" prop="address">
+      <el-form-item
+        v-if="compeny.company_type != 30"
+        label="地址"
+        prop="address"
+      >
         <el-input
           disabled
           v-model="compeny.address"
@@ -259,7 +267,11 @@
           />
         </el-form-item>
         <el-form-item label="身份证号">
-          <el-input v-model="persen.id" placeholder="请输入身份证号" disabled />
+          <el-input
+            v-model="persen.id_card"
+            placeholder="请输入身份证号"
+            disabled
+          />
         </el-form-item>
         <el-form-item label="省" prop="province">
           <el-select