bug修复提交

src/api/material/manage.js

@@ -14,7 +14,7 @@ export async function getTreeByPid (pid) {
 export async function addMaterial (data) {
   const res = await request.post(`/main/category/add`, data);
   if (res.data.code == 0) {
-    return res.data.data;
+    return res.data.message;
   }
   return Promise.reject(new Error(res.data.message));
 }

src/enum/dict.js

@@ -40,5 +40,5 @@ export const numberList = [
   'schedule_type',
   'leadtime_unit',
   'inspection_scheme',
-  'angle', 
+  'angle'
 ];

src/views/equipmentManage/components/equipment-search.vue

@@ -18,17 +18,17 @@
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 5 } : { span: 4 }">
-        <el-form-item label="牌号">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+        <el-form-item label="牌号" label-width="50px">
+          <el-input clearable v-model="where.brandNum" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 5 } : { span: 4 }">
-        <el-form-item label="型号">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+        <el-form-item label="型号"  label-width="50px">
+          <el-input clearable v-model="where.modelType" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 4 } : { span: 4 }">
-        <el-form-item>
+        <el-form-item label-width="0">
           <el-button
             type="primary"
             icon="el-icon-search"
@@ -58,14 +58,10 @@
       const defaultWhere = {
         name: '',
         code: '',
-        appType: ''
+        brandNum: '',
+        modelType:''
       };
       return {
-        options: [
-          { value: 0, label: '全部' },
-          { value: 1, label: '业务字典' },
-          { value: 2, label: '数据字典' }
-        ],
         defaultWhere,
         // 表单数据
         where: { ...defaultWhere }
@@ -80,9 +76,6 @@
     methods: {
       /* 搜索 */
       search () {
-        if (this.where.appType === 0) {
-          this.where.appType = '';
-        }
         this.$emit('search', this.where);
       },
       /*  重置 */

src/views/equipmentManage/index.vue

@@ -117,8 +117,8 @@
         this.$refs.linkMaterialDialogRef.open(type, this.current);
       },
       /* 刷新表格 */
-      reload () {
-        this.$refs.table.reload();
+      reload (where) {
+        this.$refs.table.reload({ where: where});
       },
       handleNodeClick (data) {
         this.categoryLevelId = data.id;

src/views/factoryModel/workshop/components/search.vue

@@ -36,6 +36,7 @@
             v-model="where.parentId"
             placeholder="请选择"
             style="width: 100%"
+            clearable
           >
             <el-option
               v-for="item in options_factory"

src/views/material/list/components/CategoryDialog.vue

@@ -99,9 +99,14 @@ export default {
 
   watch: {
 
+
   },
   methods: {
-    open(){
+    open(item){
+      if(item){
+        this.current = item
+        this.radio = item.id
+      }
       this.categoryVisible = true
       this.getList()
     },
@@ -116,6 +121,7 @@ export default {
       this.categoryVisible = false
       this.current = null
       this.radio = ''
+      this.search = {}
     },
     reset(){
       this.search={}

src/views/material/list/components/list-edit.vue

@@ -94,7 +94,8 @@
         // 提交状态
         loading: false,
         // 是否是修改
-        isUpdate: false
+        isUpdate: false,
+        chooseItem:null
       };
     },
     computed: {
@@ -105,11 +106,15 @@
     },
     methods: {
       chooseCategory(){
-           this.$refs.categoryRefs.open()
+          let item = {
+             id: this.form.categoryLevelRootId,
+             name: this.form.categoryLevelRootName
+          }
+           this.$refs.categoryRefs.open(item)
       },
       changeCategory(row){
-         this.$set(this.form,'categoryLevelRootName',row.name)
-         this.$set(this.form,'categoryLevelRootId',row.id)
+            this.$set(this.form,'categoryLevelRootName',row.name)
+            this.$set(this.form,'categoryLevelRootId',row.id)
       },
       /* 保存编辑 */
       save() {

src/views/material/manage/components/PlanInfo.vue

@@ -11,22 +11,22 @@
          <el-row :gutter="24">
            <el-col :span="8">
              <el-form-item label="固定提前期" prop="fixLeadTime">
-                <el-input  v-model="form.fixLeadTime"/>
+                <el-input  v-model="form.fixLeadTime" @input="inputFix"/>
              </el-form-item>
            </el-col>
            <el-col :span="8">
              <el-form-item label="变动提前期" prop="changeLeadTime">
-                <el-input  v-model="form.changeLeadTime"/>
+                <el-input  v-model="form.changeLeadTime" @input="inputChange"/>
              </el-form-item>
            </el-col>
            <el-col :span="8">
              <el-form-item label="检验提前期" prop="checkLeadTime">
-                <el-input  v-model="form.checkLeadTime"/>
+                <el-input  v-model="form.checkLeadTime" @input="inputCheck"/>
              </el-form-item>
            </el-col>
            <el-col :span="8">
              <el-form-item label="累计提前期" prop="cumLeadTime">
-                <el-input  v-model="form.cumLeadTime"/>
+                <el-input  v-model="form.cumLeadTime" readonly/>
              </el-form-item>
            </el-col>
            <el-col :span="8">
@@ -66,8 +66,24 @@
     },
 
     methods: {
-
-
+      inputFix(val){
+         const  changeLeadTime = this.form.changeLeadTime?Number(this.form.changeLeadTime):0
+         const  checkLeadTime = this.form.checkLeadTime?Number(this.form.checkLeadTime):0
+         val = val?Number(val):0
+         this.form.cumLeadTime = val + changeLeadTime  + checkLeadTime
+      },
+      inputChange(val){
+        const  fixLeadTime = this.form.fixLeadTime?Number(this.form.fixLeadTime):0
+        const  checkLeadTime = this.form.checkLeadTime?Number(this.form.checkLeadTime):0
+        val = val?Number(val):0
+         this.form.cumLeadTime = val + fixLeadTime  + checkLeadTime
+      },
+      inputCheck(val){
+          const  fixLeadTime = this.form.fixLeadTime?Number(this.form.fixLeadTime):0
+          const  changeLeadTime = this.form.changeLeadTime?Number(this.form.changeLeadTime):0
+          val = val?Number(val):0
+         this.form.cumLeadTime = val + fixLeadTime  + changeLeadTime
+      }
     }
   };
 </script>

src/views/material/manage/components/index-data.vue

@@ -22,7 +22,7 @@
             class="ele-btn-icon"
             @click="openEdit({},2)"
           >
-            添加
+            新建物料
           </el-button>
       </template>
       <template v-slot:action="{ row }">

src/views/material/manage/manageMaterial.vue

@@ -15,10 +15,6 @@
                  </el-col>
                </el-row>
             </div>
-            <div>
-               <el-button @click="cancel">返回</el-button>
-               <el-button type="primary" @click="submit" :loading="loading">保存</el-button>
-            </div>
          </div>
          <div class="divider">
            <div class="title">
@@ -126,29 +122,34 @@
              </el-form-item>
            </el-col>
          </el-row>
+
+         <!-- 物料组弹窗 -->
+         <GroupDialog ref="groupRefs" @changeMaterial='determineChoose'/>
+         <!-- 分类选择弹窗 -->
+         <CategoryDialog ref="categoryRefs" @chooseCategory='confirmCategory'/>
+         <!-- 仓储配置 -->
+         <WarehouseInfo ref="warehouseRefs" :form="categoryWms"/>
+         <!-- 生产信息 -->
+          <ProductionInfo ref="productionRefs" :form="categoryMes"/>
+          <!-- 计划 -->
+          <PlanInfo ref="planRefs" :form="categoryAps"/>
+          <!-- 质量配置 -->
+          <QualityInfo ref="qualityRefs" :form="categoryQms"/>
+          <!-- 舟皿信息 -->
+          <BoatInfo ref="qualityRefs" :form="categoryPallet"/>
+          <!-- 周转车信息 -->
+          <TurnoverInfo ref="turnoverRefs" :form="categoryVehicle"/>
+          <!-- 模具信息 -->
+          <MoldInfo ref="moldRefs" :form="categoryMold"/>
+          <!-- 备注信息 -->
+          <RemarkInfo ref="remarkRefs" :form="remarkform"/>
+         <div class="footer-btn">
+             <el-button @click="cancel">返回</el-button>
+             <el-button type="primary" @click="submit" :loading="loading">保存</el-button>
+          </div>
       </el-form>
     </el-card>
 
-    <!-- 物料组弹窗 -->
-    <GroupDialog ref="groupRefs" @changeMaterial='determineChoose'/>
-    <!-- 分类选择弹窗 -->
-    <CategoryDialog ref="categoryRefs" @chooseCategory='confirmCategory'/>
-    <!-- 仓储配置 -->
-    <WarehouseInfo ref="warehouseRefs" :form="categoryWms"/>
-    <!-- 生产信息 -->
-     <ProductionInfo ref="productionRefs" :form="categoryMes"/>
-     <!-- 计划 -->
-     <PlanInfo ref="planRefs" :form="categoryAps"/>
-     <!-- 质量配置 -->
-     <QualityInfo ref="qualityRefs" :form="categoryQms"/>
-     <!-- 舟皿信息 -->
-     <BoatInfo ref="qualityRefs" :form="categoryPallet"/>
-     <!-- 周转车信息 -->
-     <TurnoverInfo ref="turnoverRefs" :form="categoryVehicle"/>
-     <!-- 模具信息 -->
-     <MoldInfo ref="moldRefs" :form="categoryMold"/>
-     <!-- 备注信息 -->
-     <RemarkInfo ref="remarkRefs" :form="remarkform"/>
   </div>
 </template>
 
@@ -179,12 +180,15 @@
     data() {
       const defaultForm = {
         categoryLevelGroupName:'',
-        categoryLevelName:'',
+        categoryLevelName:''
       };
       return {
          loading:false,
          form:{...defaultForm},
-         categoryAps:{},
+         categoryAps:{
+           unit:1,
+           orderIntervalUnit:1
+         },
          categoryMes:{},
          categoryMold:{},
          categoryPallet:{},
@@ -238,8 +242,8 @@
            this.judgeSet(info)
            delete this.form.remarkAttach
            delete this.form.remark
-           // this.$set(this.remarkform,'remarkAttach',info.remarkAttach)
-           this.$set(this.remarkform,'remark',info.remark)
+           this.$set(this.remarkform,'remarkAttach',info.category.remarkAttach)
+           this.$set(this.remarkform,'remark',info.category.remark)
            this.$set(this.form,'categoryLevelGroupName',this.chooseItem.name)
            if(this.titileStatus == 1){
               delete this.form.code
@@ -344,6 +348,8 @@
       changeProduct(){
          if(!this.form.isProduct){
            this.$refs.manageForm.clearValidate(["productCategoryLevelName"]);
+           this.$set(this.form,'productCategoryLevelName','')
+           this.$set(this.form,'productCategoryLevelId','')
          }
       },
 
@@ -436,4 +442,11 @@
       margin-left:15px;
     }
   }
+  .footer-btn{
+    width:100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin:20px auto;
+  }
 </style>

src/views/material/productLinkMaterial/components/product-search.vue

@@ -19,12 +19,12 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 5 } : { span: 4 }">
         <el-form-item label="牌号">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model="where.brandNum" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 5 } : { span: 4 }">
         <el-form-item label="型号">
-          <el-input clearable v-model="where.name" placeholder="请输入" />
+          <el-input clearable v-model="where.modelType" placeholder="请输入" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { md: 4 } : { span: 4 }">
@@ -57,14 +57,10 @@
       const defaultWhere = {
         name: '',
         code: '',
-        appType: ''
+        brandNum: '',
+        modelType:''
       };
       return {
-        options: [
-          { value: 0, label: '全部' },
-          { value: 1, label: '业务字典' },
-          { value: 2, label: '数据字典' }
-        ],
         defaultWhere,
         // 表单数据
         where: { ...defaultWhere }
@@ -79,9 +75,6 @@
     methods: {
       /* 搜索 */
       search () {
-        if (this.where.appType === 0) {
-          this.where.appType = '';
-        }
         this.$emit('search', this.where);
       },
       /*  重置 */

src/views/material/productLinkMaterial/index.vue

@@ -120,8 +120,8 @@
         this.$refs.linkMaterialDialogRef.open(type, this.current);
       },
       /* 刷新表格 */
-      reload () {
-        this.$refs.table.reload();
+      reload (where) {
+        this.$refs.table.reload({where:where});
       },
       handleNodeClick (data) {
         this.categoryLevelId = data.id;

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

@@ -35,7 +35,7 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="检验方式:" prop="checkMethod">
-            <el-select v-model="form.checkMethod" placeholder="请选择">
+            <el-select filterable v-model="form.checkMethod" placeholder="请选择">
               <el-option
                 v-for="item in checkMethodList"
                 :key="item.value"
@@ -46,9 +46,29 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="8" v-if="form.checkMethod==2">
+          <el-form-item label="互检:" prop="huj">
+             <el-switch
+               v-model="form.huj"
+               :active-value='1'
+               :inactive-value='0'
+             >
+             </el-switch>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" v-if="form.checkMethod==2">
+          <el-form-item label="专检:" prop="zj">
+              <el-switch
+                v-model="form.zj"
+                :active-value='1'
+                :inactive-value='0'
+              >
+              </el-switch>
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="报工方式:" prop="submitMethod">
-            <el-select v-model="form.submitMethod" placeholder="请选择">
+            <el-select filterable v-model="form.submitMethod" placeholder="请选择">
               <el-option
                 v-for="item in submitMethodList"
                 :key="item.code"
@@ -61,7 +81,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="加工方式:" prop="produceMethod">
-            <el-select v-model="form.produceMethod" placeholder="请选择">
+            <el-select filterable v-model="form.produceMethod" placeholder="请选择">
               <el-option
                 v-for="item in produceMethodList"
                 :key="item.value"
@@ -101,7 +121,7 @@
         id: null,
         code: '',
         name: '',
-        checkMethod: '',
+        checkMethod: 2,
         submitMethod: '',
         produceMethod: ''
       };
@@ -116,15 +136,15 @@
             { required: true, message: '请输入控制码名称', trigger: 'blur' }
           ],
           code: [{ required: true, trigger: 'change' }],
-          checkMethod: [
-            { required: true, message: '请选择检验方式', trigger: 'blur' }
-          ],
+          // checkMethod: [
+          //   { required: true, message: '请选择检验方式', trigger: 'blur' }
+          // ],
           submitMethod: [
             { required: true, message: '请选择报工方式', trigger: 'blur' }
           ],
-          produceMethod: [
-            { required: true, message: '请选择加工方式', trigger: 'blur' }
-          ]
+          // produceMethod: [
+          //   { required: true, message: '请选择加工方式', trigger: 'blur' }
+          // ]
         },
         // 提交状态
         loading: false,

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

@@ -30,7 +30,12 @@
         </el-col>
         <el-col :span="10">
           <el-form-item label="默认值:">
-            <el-input v-model="form.defaultValue" placeholder="请输入" />
+            <!-- <el-input type="number" v-model="form.defaultValue" maxlength="8" placeholder="请输入" /> -->
+            <el-input
+              oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '').replace(/^0+(?!\.|$)/g, ''),value = Number(value) >= 999999.99 ? 999999.99 : value"
+              v-model="form.defaultValue"
+              placeholder="请输入"
+            ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="10">
@@ -40,12 +45,22 @@
         </el-col>
         <el-col :span="10">
           <el-form-item label="参数上限:">
-            <el-input placeholder="请输入" v-model="form.maxValue" />
+            <!-- <el-input placeholder="请输入" v-model="form.maxValue" /> -->
+            <el-input
+              oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '').replace(/^0+(?!\.|$)/g, ''),value = Number(value) >= 999999.99 ? 999999.99 : value"
+              v-model="form.maxValue"
+              placeholder="请输入"
+            ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="10">
           <el-form-item label="参数下限:">
-            <el-input placeholder="请输入" v-model="form.minValue" />
+            <!-- <el-input placeholder="请输入" v-model="form.minValue" /> -->
+            <el-input
+              oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '').replace(/^0+(?!\.|$)/g, ''),value = Number(value) >= 999999.99 ? 999999.99 : value"
+              v-model="form.minValue"
+              placeholder="请输入"
+            ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="20">
@@ -63,7 +78,7 @@
             <el-select
               v-model="form.categoryType"
               filterable
-              placeholder="清选择"
+              placeholder="请选择"
             >
               <el-option
                 v-for="item in statusList"
@@ -77,7 +92,7 @@
         </el-col>
         <el-col :span="10">
           <el-form-item label="是否必填:" prop="notNull">
-            <el-select v-model="form.notNull" filterable placeholder="清选择">
+            <el-select v-model="form.notNull" filterable placeholder="请选择">
               <el-option
                 v-for="item in timeType"
                 :key="item.value"
@@ -127,7 +142,7 @@
         minValue: '',
         unitName: '',
         remark: '',
-        notNull: ''
+        notNull: 0
       };
       return {
         defaultForm,
@@ -197,7 +212,8 @@
               .then((msg) => {
                 this.loading = false;
                 this.form = {};
-                this.$message.success(msg);
+                const info = this.isUpdate?'修改成功':'新增成功'
+                this.$message.success(info);
                 this.updateVisible(false);
                 this.$emit('done');
               })
@@ -231,6 +247,7 @@
           }
         } else {
           this.$refs.form.clearValidate();
+          this.$refs.form1.clearValidate();
           this.form = { ...this.defaultForm };
         }
       }

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

@@ -30,7 +30,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="控制码:" prop="controlId">
-             <el-select v-model="form.controlId">
+             <el-select v-model="form.controlId" filterable>
                <el-option
                  v-for="item in controlList"
                  :key="item.id"
@@ -48,7 +48,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="工序时间单位:" prop="timeUnit">
-            <el-select v-model="form.timeUnit">
+            <el-select v-model="form.timeUnit" filterable>
               <el-option
                 v-for="item in timeType"
                 :key="item.code"
@@ -102,7 +102,7 @@
         <el-col :span="24">
           <el-col :span="12">
             <el-form-item label="间隔策略:">
-              <el-select v-model="form.intervalTime.tactics">
+              <el-select v-model="form.intervalTime.tactics" filterable>
                 <el-option
                   v-for="item in tacticsType"
                   :key="item.code"

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

@@ -257,9 +257,11 @@
             removeList: this.removeList,
             saveList: arr
           })
-          .then(() => {
-            this.$message.success('保存成功！');
-            this.updateVisible(false);
+          .then((msg) => {
+            if(msg){
+              this.$message.success(msg);
+              this.updateVisible(false);
+            }
           });
 
         // this.$refs.form.validate((valid) => {

src/views/technology/production/index.vue

@@ -12,7 +12,7 @@
         row-key="code"
       >
         <!-- 表头工具栏 -->
-        <template v-slot:toolbar>
+<!--        <template v-slot:toolbar>
           <el-button
             size="small"
             type="primary"
@@ -31,7 +31,7 @@
           >
             删除
           </el-button>
-        </template>
+        </template> -->
 
         <template v-slot:roleList="{ row }">
           <el-tag
@@ -48,14 +48,14 @@
 
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
-          <el-link
+<!--          <el-link
             type="primary"
             :underline="false"
             icon="el-icon-edit"
             @click="openEdit(row)"
           >
             修改
-          </el-link>
+          </el-link> -->
           <el-link
             type="primary"
             :underline="false"
@@ -65,7 +65,7 @@
             配置工艺参数
           </el-link>
 
-          <el-popconfirm
+<!--          <el-popconfirm
             class="ele-action"
             title="确定要删除当前工序吗？"
             @confirm="remove(row)"
@@ -75,7 +75,7 @@
                 删除
               </el-link>
             </template>
-          </el-popconfirm>
+          </el-popconfirm> -->
         </template>
       </ele-pro-table>
     </el-card>
@@ -113,14 +113,13 @@
       return {
         // 表格列配置
         columns: [
-          {
-            columnKey: 'selection',
-            type: 'selection',
-            width: 45,
-            align: 'center',
-            fixed: 'left'
-          },
-
+          // {
+          //   columnKey: 'selection',
+          //   type: 'selection',
+          //   width: 45,
+          //   align: 'center',
+          //   fixed: 'left'
+          // },
           {
             prop: 'code',
             label: '工序编码',

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

@@ -1,7 +1,7 @@
 <!-- 搜索表单 -->
 <template>
   <el-form
-    label-width="120px"
+    label-width="100px"
     class="ele-form-search"
     @keyup.enter.native="search"
     @submit.native.prevent
@@ -43,19 +43,20 @@
           </el-select>
         </el-form-item>
       </el-col>
-
       <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">
-        <div class="ele-form-actions">
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            class="ele-btn-icon"
-            @click="search"
-          >
-            查询
-          </el-button>
-          <el-button @click="reset">重置</el-button>
-        </div>
+        <el-form-item label-width="20px">
+          <div class="ele-form-actions">
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              class="ele-btn-icon"
+              @click="search"
+            >
+              查询
+            </el-button>
+            <el-button @click="reset">重置</el-button>
+          </div>
+        </el-form-item>
       </el-col>
     </el-row>
   </el-form>

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

@@ -30,7 +30,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="所属工厂:" prop="factoryId">
-            <el-select v-model="form.factoryId" placeholder="请选择">
+            <el-select v-model="form.factoryId" placeholder="请选择" filterable>
               <el-option
                 v-for="item in fList"
                 :key="item.id"
@@ -62,7 +62,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="状态:" prop="status">
-            <el-select v-model="form.status" placeholder="">
+            <el-select v-model="form.status" placeholder="" filterable>
               <el-option
                 v-for="item in statusList"
                 :key="item.value"

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

@@ -17,7 +17,7 @@
           <el-input clearable v-model="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
+<!--      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
         <el-form-item label="生产版本:">
           <el-input
             clearable
@@ -26,9 +26,9 @@
             placeholder="请输入"
           />
         </el-form-item>
-      </el-col>
+      </el-col> -->
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
-        <el-form-item label="状态:">
+        <el-form-item label="状态:" label-width="70px">
           <el-select v-model="where.status" filterable placeholder="请选择">
             <el-option
               v-for="item in statusList"

src/views/technology/route/index.vue

@@ -9,10 +9,10 @@
         :columns="columns"
         :datasource="datasource"
         :selection.sync="selection"
-        row-key="code"
+        row-key="id"
       >
         <!-- 表头工具栏 -->
-        <template v-slot:toolbar>
+<!--        <template v-slot:toolbar>
           <el-button
             size="small"
             type="primary"
@@ -22,7 +22,7 @@
           >
             新建
           </el-button>
-        </template>
+        </template> -->
 
         <!-- 状态列 -->
         <template v-slot:status="{ row }">
@@ -31,14 +31,14 @@
 
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
-          <el-link
+<!--          <el-link
             type="primary"
             :underline="false"
             icon="el-icon-edit"
             @click="openEdit(row)"
           >
             修改
-          </el-link>
+          </el-link> -->
           <el-link
             type="primary"
             :underline="false"
@@ -48,7 +48,7 @@
             配置工序
           </el-link>
 
-          <el-popconfirm
+<!--          <el-popconfirm
             v-if="row.status != 1"
             class="ele-action"
             title="确定要删除当前工序吗？"
@@ -59,7 +59,7 @@
                 删除
               </el-link>
             </template>
-          </el-popconfirm>
+          </el-popconfirm> -->
         </template>
       </ele-pro-table>
     </el-card>
@@ -97,13 +97,13 @@
       return {
         // 表格列配置
         columns: [
-          {
-            columnKey: 'selection',
-            type: 'selection',
-            width: 45,
-            align: 'center',
-            fixed: 'left'
-          },
+          // {
+          //   columnKey: 'selection',
+          //   type: 'selection',
+          //   width: 45,
+          //   align: 'center',
+          //   fixed: 'left'
+          // },
 
           {
             prop: 'code',

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

@@ -31,7 +31,7 @@
 
         <el-col :span="8">
           <el-form-item label="所属工厂:" prop="factoryId">
-            <el-select v-model="form.factoryId" placeholder="所属工厂">
+            <el-select v-model="form.factoryId" filterable placeholder="所属工厂">
               <el-option
                 v-for="item in flist"
                 :key="item.id"
@@ -44,7 +44,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="工作中心类别:" prop="categoryType">
-            <el-select v-model="form.categoryType" placeholder="工作中心类别">
+            <el-select v-model="form.categoryType" filterable placeholder="工作中心类别">
               <el-option
                 v-for="item in categoryTypes"
                 :key="item.code"
@@ -57,7 +57,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="负责人:" prop="leaderUserId">
-            <el-select v-model="form.leaderUserId" placeholder="负责人">
+            <el-select v-model="form.leaderUserId" filterable placeholder="负责人">
               <el-option
                 v-for="item in userList"
                 :key="item.id"

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

@@ -9,7 +9,7 @@
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="所属工厂:">
-          <el-select v-model="where.factoryId" placeholder="所属工厂">
+          <el-select v-model="where.factoryId" filterable placeholder="所属工厂">
             <el-option
               v-for="item in flist"
               :key="item.id"
@@ -33,7 +33,7 @@
 
       <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
         <el-form-item label="工作中心类别:">
-          <el-select v-model="where.categoryType" placeholder="工作中心类别">
+          <el-select v-model="where.categoryType" filterable placeholder="工作中心类别">
             <el-option
               v-for="item in categoryTypes"
               :key="item.code"