Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/views/technology/route/components/production/components/user-search.vue

@@ -102,7 +102,7 @@
       const defaultWhere = {
         code: '',
         name: '',
-        factoriesId: '',
+        factoriesId: this.$store.state.user.info.factoryId || '',
         workCenterId: ''
         // nickname: '',
         // sex: undefined

src/views/technology/route/components/user-edit.vue

@@ -154,7 +154,7 @@
       const defaultForm = {
         code: '',
         name: '',
-        factoryId: '',
+        factoryId: this.$store.state.user.info.factoryId || '',
         status: 1,
         categoryId: '',
         produceVersionId: '',
@@ -202,9 +202,6 @@
         versionList: [],
         // 提交状态
 
-        // 是否是修改
-        isUpdate: false,
-
         taskInstanceList: [],
         removeList: [],
         isCategory: false
@@ -362,7 +359,6 @@
               ...res,
               versionUpgradeType: 0
             });
-            this.isUpdate = true;
           } else {
             // const res = await route.getCode();
             // this.form.code = res;
@@ -376,10 +372,6 @@
           this.$refs.form.clearValidate();
           this.form = { ...this.defaultForm };
         }
-      },
-      isUpdate(v) {
-        console.log(v, 66666);
-        this.isUpdate = v;
       }
     }
   };

src/views/technology/route/components/user-search.vue

@@ -1,6 +1,11 @@
 <!-- 搜索表单 -->
 <template>
-  <el-form label-width="120px" class="ele-form-search" @keyup.enter.native="search" @submit.native.prevent>
+  <el-form
+    label-width="120px"
+    class="ele-form-search"
+    @keyup.enter.native="search"
+    @submit.native.prevent
+  >
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="工艺路线编码:">
@@ -23,8 +28,18 @@
       </el-col> -->
       <el-col v-bind="styleResponsive ? { lg: 3, md: 12 } : { span: 3 }">
         <el-form-item label="状态:" label-width="70px">
-          <el-select v-model.trim="where.status" filterable placeholder="请选择" style="width: 100%">
-            <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value">
+          <el-select
+            v-model.trim="where.status"
+            filterable
+            placeholder="请选择"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item in statusList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
         </el-form-item>
@@ -54,84 +69,87 @@
       </el-col> -->
       <el-col v-bind="styleResponsive ? { lg: 3, md: 12 } : { span: 3 }">
         <el-form-item label-width="20px">
-          <el-button type="primary" icon="el-icon-search" class="ele-btn-icon" @click="search">
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            class="ele-btn-icon"
+            @click="search"
+          >
             查询
           </el-button>
           <el-button @click="reset">重置</el-button>
         </el-form-item>
       </el-col>
     </el-row>
-   
   </el-form>
 </template>
 
 <script>
-import { pageList } from '@/api/technology/version/version.js';
-import { getFactoryarea } from '@/api/factoryModel';
-export default {
-  data() {
-    // 默认表单数据
-    const defaultWhere = {
-      code: '',
-      name: '',
-      status: 1,
-      produceVersionId: '',
-      factoriesId: ''
-    };
-    return {
-      // 表单数据
-      where: { ...defaultWhere },
-      statusList: [
-        { label: '草稿', value: -1 },
-        { label: '失效', value: 0 },
-        { label: '生效', value: 1 }
-      ],
+  import { pageList } from '@/api/technology/version/version.js';
+  import { getFactoryarea } from '@/api/factoryModel';
+  export default {
+    data() {
+      // 默认表单数据
+      const defaultWhere = {
+        code: '',
+        name: '',
+        status: 1,
+        produceVersionId: '',
+        factoriesId: ''
+      };
+      return {
+        // 表单数据
+        where: { ...defaultWhere },
+        statusList: [
+          { label: '草稿', value: -1 },
+          { label: '失效', value: 0 },
+          { label: '生效', value: 1 }
+        ],
 
-      versionList: [],
-      options_factory:[]
-    };
-  },
+        versionList: [],
+        options_factory: []
+      };
+    },
 
-  created() {
-    this.getVersionList()
-    this.getFactoryarea();
-  },
-  computed: {
-    // 是否开启响应式布局
-    styleResponsive() {
-      return this.$store.state.theme.styleResponsive;
-    }
-  },
-  methods: {
-    /* 搜索 */
-    search() {
-      this.$emit('search', this.where);
+    created() {
+      this.getVersionList();
+      this.getFactoryarea();
     },
-    /*  重置 */
-    reset() {
-      this.where = { ...this.defaultWhere }
-      this.search();
+    computed: {
+      // 是否开启响应式布局
+      styleResponsive() {
+        return this.$store.state.theme.styleResponsive;
+      }
     },
+    methods: {
+      /* 搜索 */
+      search() {
+        this.$emit('search', this.where);
+      },
+      /*  重置 */
+      reset() {
+        this.where = { ...this.defaultWhere };
+        this.search();
+      },
 
-    async getVersionList() {
-      const res = await pageList({
-        pageNum: 1,
-        size: 100
-      });
-
-      this.versionList = res.list;
-    },
-    // 获取工厂数据
-    getFactoryarea() {
-      let par = {
-        type: 1,
-        size: 9999,
+      async getVersionList() {
+        const res = await pageList({
+          pageNum: 1,
+          size: 100
+        });
 
-      };
-      getFactoryarea(par).then((res) => {
-        this.options_factory = res.list;
-      });
-    },
-  }
-};
+        this.versionList = res.list;
+      },
+      // 获取工厂数据
+      getFactoryarea() {
+        let par = {
+          type: 1,
+          size: 9999
+        };
+        getFactoryarea(par).then((res) => {
+          this.options_factory = res.list;
+        });
+      }
+    }
+  };
 </script>