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

src/views/material/BOMmanage/components/routingDialog.vue

@@ -55,7 +55,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
+            <!-- <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
               <el-form-item label="状态:" label-width="70px">
                 <el-select
                   v-model.trim="where.status"
@@ -71,7 +71,7 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-            </el-col>
+            </el-col> -->
 
             <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 4 }">
               <el-form-item label-width="20px">
@@ -338,6 +338,7 @@
       },
       /* 表格数据源 */
       async datasource({ page, limit, where, order }) {
+        where.status=1
         const res = await route.list({
           ...where,
           ...order,

src/views/material/BOMmanage/components/workingProcedure.vue

@@ -536,7 +536,6 @@ export default {
       attributeData: {},
       visible: false,
       title: '配置',
-      form: {},
       statusOption: [
         {
           label: '启用',

src/views/material/BOMmanage/file/index.vue

@@ -247,7 +247,7 @@
           pageNum: page,
           size: limit,
           directoryId: this.parentData?.id,
-          lcyStatus: 1,
+          lcyStatus: '3',
           fileType: 0
         });
       },

src/views/material/product/detail.vue

@@ -1109,11 +1109,11 @@ export default {
       }else{
         this.attributeList=[
           {
-            label: '总装',
+            label: '总装(成品)',
             value: 1
           },
           {
-            label: '部件',
+            label: '部件(半成品)',
             value: 2
           },
           {

src/views/technology/route/index.vue

@@ -146,12 +146,12 @@
             showOverflowTooltip: true,
             fixed: 'left'
           },
-          {
-            slot: 'routeType',
-            label: '类型',
-            align: 'center',
-            showOverflowTooltip: true
-          },
+          // {
+          //   slot: 'routeType',
+          //   label: '类型',
+          //   align: 'center',
+          //   showOverflowTooltip: true
+          // },
           {
             prop: 'code',
             label: '工艺路线编码',