From 7d960355fd82a106ae8e15f6f83d4324145e7b24 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 10 十一月 2023 09:51:46 +0800
Subject: [PATCH] 	modified:   src/views/common/param-mergeTemplate.vue 	modified:   src/views/technology/routing/routing-form.vue

---
 src/views/basic/division/division-form.vue |   82 ++++++++++++++++++-----------------------
 1 files changed, 36 insertions(+), 46 deletions(-)

diff --git a/src/views/basic/division/division-form.vue b/src/views/basic/division/division-form.vue
index dd0fcaa..dd96889 100644
--- a/src/views/basic/division/division-form.vue
+++ b/src/views/basic/division/division-form.vue
@@ -1,50 +1,25 @@
 <template>
-  <el-dialog
-    :title="!dataForm.id ? '鏂板' : '淇敼'"
-    :close-on-click-modal="false"
-    :visible.sync="visible"
-  >
-    <el-form
-      :model="dataForm"
-      :rules="dataRule"
-      ref="dataForm"
-      label-width="80px"
-      class="l-mes"
-    >
+  <el-dialog :title="!dataForm.id ? '鏂板' : '淇敼'" :close-on-click-modal="false" :visible.sync="visible">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="80px" class="l-mes">
       <el-row>
         <el-col :span="12">
           <el-form-item label="閮ㄩ棬缂栧彿" prop="divisionNo">
-            <el-input
-              v-model="dataForm.divisionNo"
-              placeholder="閮ㄩ棬缂栧彿"
-            ></el-input>
+            <el-input v-model="dataForm.divisionNo" placeholder="閮ㄩ棬缂栧彿"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="閮ㄩ棬鍚嶇О" prop="divisionName">
-            <el-input
-              v-model="dataForm.divisionName"
-              placeholder="閮ㄩ棬鍚嶇О"
-            ></el-input>
+            <el-input v-model="dataForm.divisionName" placeholder="閮ㄩ棬鍚嶇О"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
           <el-form-item label="鍏徃" prop="companyId">
-            <el-select
-            @change="changeCompany"
-              v-model="dataForm.companyId"
-              filterable
-              placeholder="璇烽�夋嫨"
-              style="width: 100%;"
-            >
-              <el-option
-                v-for="(item, index) in this.companyOptions"
-                :key="index"
-                :label="item.companyName"
-                :value="item.id"
-              >
+            <el-select @change="changeCompany" v-model="dataForm.companyId" filterable placeholder="璇烽�夋嫨"
+              style="width: 100%;">
+              <el-option v-for="(item, index) in this.companyOptions" :key="index" :label="item.companyName"
+                :value="item.id">
               </el-option>
             </el-select>
           </el-form-item>
@@ -68,12 +43,7 @@
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">鍙栨秷</el-button>
-      <el-button
-        type="primary"
-        :disabled="isSubmit"
-        v-thinclick="`dataFormSubmit`"
-        >纭畾</el-button
-      >
+      <el-button type="primary" :disabled="isSubmit" v-thinclick="`dataFormSubmit`">纭畾</el-button>
     </span>
   </el-dialog>
 </template>
@@ -93,7 +63,7 @@
   data() {
     return {
       visible: false,
-      factotyOption:[],
+      factotyOption: [],
       dataForm: {
         id: 0,
         divisionNo: '',
@@ -137,22 +107,29 @@
         /* this.initCompanySelect();
           this.initStaffSelect(); */
         if (this.dataForm.id) {
+          console.log(111);
           getObj(this.dataForm.id).then((response) => {
             this.dataForm = response.data.data
+            this.dataForm.factotyId = response.data.data.factoryId
+            this.changeCompany()
           })
         }
       })
     },
     changeCompany() {
-      console.log(this.dataForm.companyId);
       loadFactoryListByCompany(this.dataForm.companyId).then((res) => {
-        console.log(res.data);
         this.factotyOption = res.data.data
       })
+      // if (this.dataForm.factotyId != '') {
+      //   let datas = this.factotyOption.filter(item => {
+      //     return item.id == this.dataForm.factotyId
+      //   });
+      //   console.log(datas);
+      // }
     },
-    changeFactory(){
-      this.dataForm.factotyName=this.factotyOption.filter(item=>{
-        return item.id==this.dataForm.factotyId
+    changeFactory() {
+      this.dataForm.factotyName = this.factotyOption.filter(item => {
+        return item.id == this.dataForm.factotyId
       })[0].factoryName;
       console.log(this.dataForm);
     },
@@ -166,8 +143,8 @@
         staffId: this.dataForm.staffId,
         companyId: this.dataForm.companyId,
         id: this.dataForm.id,
+        factoryId: this.dataForm.factotyId,
         factoryName: this.dataForm.factotyName,
-        factotyId: this.dataForm.factotyId
       }
       this.$refs.dataForm.validate((valid) => {
         if (valid) {
@@ -210,6 +187,19 @@
   created() {
     this.initCompanySelect()
     this.initStaffSelect()
+  },
+  watch: {
+    'dataForm.companyId': {
+      handler(newValue, oldValue) {
+        if (newValue != ''&&oldValue!='') {
+            if(oldValue!=newValue){
+              this.dataForm.factotyId=null
+            }
+        }
+      },
+      immediate: true,
+      deep: true
+    }
   }
 }
 </script>

--
Gitblit v1.9.3