Merge pull request 'lukeyan' (#24) from lukeyan into master

Reviewed-on: #24

src/views/systemManagement/companyList/components/companyDataDialog.vue

@@ -10,28 +10,28 @@
             <el-form-item label="企业名称">
               <el-input v-model="form.companyName"></el-input>
             </el-form-item>
-            <el-form-item label="统一社会信用代码">
+            <el-form-item label="统一社会信用代码" prop="socialCreditCode">
               <el-input v-model="form.socialCreditCode"></el-input>
             </el-form-item>
-            <el-form-item label="企业性质">
+            <el-form-item label="企业性质" prop="companyNature">
               <el-input v-model="form.companyNature"></el-input>
             </el-form-item>
-            <el-form-item label="营业期限">
+            <el-form-item label="营业期限" prop="businessTermDate">
               <el-input v-model="form.businessTermDate"></el-input>
             </el-form-item>
-            <el-form-item label="发照日期">
+            <el-form-item label="发照日期" prop="businessLicenseDate">
               <el-input v-model="form.businessLicenseDate"></el-input>
             </el-form-item>
-            <el-form-item label="成立日期">
+            <el-form-item label="成立日期" prop="establishDate">
               <el-input v-model="form.establishDate"></el-input>
             </el-form-item>
-            <el-form-item label="注册资本">
+            <el-form-item label="注册资本" prop="registerCapital">
               <el-input v-model="form.registerCapital"></el-input>
             </el-form-item>
-            <el-form-item label="登记机关">
+            <el-form-item label="登记机关" prop="registerAuthority">
               <el-input v-model="form.registerAuthority"></el-input>
             </el-form-item>
-            <el-form-item label="企业经营状态">
+            <el-form-item label="企业经营状态" prop="businessStatus">
               <el-input v-model="form.businessStatus"></el-input>
             </el-form-item>
           </el-form>
@@ -48,7 +48,7 @@
           <el-form-item label="企业登记注册地">
             <el-input v-model="form.registerAddress"></el-input>
           </el-form-item>
-          <el-form-item label="企业类型">
+          <el-form-item label="企业类型" prop="companyTypes">
             <el-checkbox-group v-model="form.companyTypes">
               <el-checkbox label="剧毒" name="companyTypes"></el-checkbox>
               <el-checkbox label="易剧毒" name="companyTypes"></el-checkbox>
@@ -61,7 +61,7 @@
               <el-checkbox label="外资合资" name="companyTypes"></el-checkbox>
             </el-checkbox-group>
           </el-form-item>
-          <el-form-item label="企业主营范围">
+          <el-form-item label="企业主营范围" prop="businessScope">
             <el-input type="textarea" v-model="form.businessScope"></el-input>
           </el-form-item>
         </el-form>
@@ -73,7 +73,7 @@
           <el-form-item label="安全责任人">
             <el-input v-model="form.emergencyContact"></el-input>
           </el-form-item>
-          <el-form-item label="责任人电话">
+          <el-form-item label="责任人电话" prop="emergencyContactPhone">
             <el-input v-model="form.emergencyContactPhone"></el-input>
           </el-form-item>
         </el-form>
@@ -116,10 +116,10 @@
           <el-form-item>
 
           </el-form-item>
-          <el-form-item label="经度">
+          <el-form-item label="经度" prop="longitude">
             <el-input v-model="form.longitude"></el-input>
           </el-form-item>
-          <el-form-item label="纬度">
+          <el-form-item label="纬度" prop="latitude">
             <el-input v-model="form.latitude"></el-input>
           </el-form-item>
           <el-form-item label="企业地址">
@@ -141,14 +141,14 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="所属片区">
+          <el-form-item label="所属片区" prop="belongingArea">
             <el-input v-model="form.belongingArea"></el-input>
           </el-form-item>
         </el-form>
       </div>
     </div>
     <div slot="footer" class="dialog-footer">
-      <el-button @click="saveFormData">确 定</el-button>
+      <el-button @click="saveFormData()">确 定</el-button>
       <el-button @click="closeForm">取 消</el-button>
     </div>
   </el-dialog>
@@ -208,8 +208,8 @@ export default {
       imageUrl: "",
       upUrl: `http://172.18.113.50:8080/zhapi/safety/system/enterpriseList`, // 图片上传地址
       upheaders: {
-        Authorization: localStorage.getItem('AuthorizationToken')
+        Authorization: localStorage.getItem("AuthorizationToken"),
-      }
+      },
     };
   },
   created() {
@@ -220,6 +220,12 @@ export default {
     open(num, item) {
       this.visible = true;
       if (num === 1) {
+        // 新建打开时，所有重置表单
+        this.$refs["commerceMessage_form"].resetFields();
+        this.$refs["commerceMessage_form_two"].resetFields();
+        this.$refs["company_person_message_form"].resetFields();
+        this.$refs["company_position_form"].resetFields();
+        this.$refs["jurisdiction_form"].resetFields();
         this.dialogTitle = "新建";
         this.form = {};
       } else if (num === 2) {
@@ -307,7 +313,6 @@ export default {
           if (res.code === 200) {
             this.$message.success("新建成功");
             this.visible = false;
-            this.form = {};
           } else {
             this.$message.warning("新建失败");
           }

src/views/systemManagement/correlationEquipment/components/equipmentTable.vue

@@ -4,7 +4,7 @@
     <p>{{ table_title }}</p>
     <!-- 查询表 -->
     <div v-if="display_search" class="equipment_data_search">
-      <el-form :inline="true" :model="search" class="search">
+      <el-form :inline="true" :model="search" class="search_data">
         <el-form-item>
           <el-input
             v-model="search.equipemnt"
@@ -34,7 +34,7 @@
       </el-form>
     </div>
     <div v-else class="equipment_data_search">
-      <el-form :inline="true" :model="search" class="search">
+      <el-form :inline="true" :model="search" class="search_data">
         <el-form-item>
           <el-input
             v-model="search.equipemnt"
@@ -321,13 +321,11 @@ export default {
 
   .equipment_data_search {
     margin-left: 12px;
-
     /deep/.el-input__inner {
       border-radius: 0px 0px 0px 0px;
       background: #3c4b4a;
       color: #fff;
     }
-
     .el-button {
       width: 100%;
       border: 1px solid #4a6072;
@@ -335,7 +333,6 @@ export default {
       border-radius: 0px !important;
       background: #323f43;
     }
-
     .el-button:focus,
     .el-button:hover {
       border: 1px solid#34e1b3;

src/views/systemManagement/correlationEquipment/index.vue

@@ -287,7 +287,7 @@ export default {
         }
       }
       .cardBodyLeft_footer {
-        height: 89.6%;
+        height: 71.7vh;
         .el-tree {
           /* 树形数据过长添加滚动条 */
           height: 100%;