投料再报工字段，所属工厂搜索

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

@@ -201,6 +201,14 @@
           </el-form-item>
         </el-col>
 
+        <el-col :span="12">
+          <el-form-item label="是否需要投料再报工:" label-width="200px">
+            <el-radio-group v-model="form.reportNeedFeed">
+              <el-radio :label="item.value" v-for="(item, i) in radioList" :key="i">{{ item.name }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+
         <!-- **** -->
         <el-col :span="12">
           <el-form-item label="投料是否要添加生产设备:" label-width="200px">
@@ -362,6 +370,7 @@ export default {
         timeUnit: '',
         feedNeedTurnover: '',
         reportNeedTurnover: '',
+        reportNeedFeed:'',
         feedNeedEquipment: '',
         reportNeedEquipment: '',
         feedNeedMould: '',

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

@@ -1,7 +1,7 @@
 <!-- 搜索表单 -->
 <template>
   <el-form label-width="120px" class="ele-form-search" @keyup.enter.native="search" @submit.native.prevent>
-    <el-row>
+    <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="工艺路线编码:">
           <el-input clearable v-model.trim="where.code" placeholder="请输入" />
@@ -21,7 +21,7 @@
             </el-select>
         </el-form-item>
       </el-col> -->
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+      <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">
@@ -30,25 +30,44 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="所属工厂:">
+          <el-select
+            v-model.trim="where.factoriesId"
+            placeholder="请选择"
+            style="width: 100%"
+            clearable
+          >
+            <el-option
+              v-for="item in options_factory"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <!-- <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="组织机构:">
           <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
+      </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>
+          <el-button @click="reset">重置</el-button>
+        </el-form-item>
       </el-col>
-      <el-form-item label-width="20px">
-        <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-row>
-    <el-row>
-
     </el-row>
+   
   </el-form>
 </template>
 
 <script>
 import { pageList } from '@/api/technology/version/version.js';
+import { getFactoryarea } from '@/api/factoryModel';
 export default {
   data() {
     // 默认表单数据
@@ -56,7 +75,8 @@ export default {
       code: '',
       name: '',
       status: 1,
-      produceVersionId: ''
+      produceVersionId: '',
+      factoriesId: ''
     };
     return {
       // 表单数据
@@ -68,11 +88,13 @@ export default {
       ],
 
       versionList: [],
+      options_factory:[]
     };
   },
 
   created() {
     this.getVersionList()
+    this.getFactoryarea();
   },
   computed: {
     // 是否开启响应式布局
@@ -99,6 +121,17 @@ export default {
 
       this.versionList = res.list;
     },
+    // 获取工厂数据
+    getFactoryarea() {
+      let par = {
+        type: 1,
+        size: 9999,
+
+      };
+      getFactoryarea(par).then((res) => {
+        this.options_factory = res.list;
+      });
+    },
   }
 };
 </script>

src/views/technology/route/index.vue

@@ -157,7 +157,7 @@ export default {
 
        
         {
-          slot: 'factoryName',
+          prop: 'factoriesName',
           label: '所属工厂',
           align: 'center',
           showOverflowTooltip: true