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

src/views/factoryModel/productionLine/index.vue

@@ -33,6 +33,14 @@
         <template v-slot:enabled="{ row }">
           {{ dict.enabled[row.enabled] }}
         </template>
+
+        <template v-slot:workCenterList="{ row }">
+          <p v-for="item in row.workCenterList">
+            {{ item.name }}
+          </p>
+
+          <!-- {{ row.workCenterList }} -->
+        </template>
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
           <el-link
@@ -123,6 +131,12 @@
             prop: 'workshopName'
           },
 
+          {
+            label: '工作中心',
+            prop: 'workCenterList',
+            slot: 'workCenterList'
+          },
+
           {
             label: '所属区域',
             prop: 'areaName'

src/views/material/BOMmanage/detailsPop.vue

@@ -173,12 +173,7 @@
               提交发布
             </el-button>
 
-            <el-button
-              type="primary"
-              size="mini"
-              @click="handleRefresh"
-              v-if="currentNodeData.approvalStatus != 1"
-            >
+            <el-button type="primary" size="mini" @click="handleRefresh">
               刷新
             </el-button>
           </div>

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

@@ -474,7 +474,7 @@
           },
           {
             prop: 'bomStatus',
-            label: 'BOM状态',
+            label: 'MBOM状态',
             align: 'center',
             minWidth: 120,
             formatter: (row, column) => {
@@ -482,6 +482,26 @@
             },
             showOverflowTooltip: true
           },
+          {
+            prop: 'pBomStatus',
+            label: 'PBOM状态',
+            align: 'center',
+            minWidth: 120,
+            formatter: (row, column) => {
+              return row.pBomStatus == 1 ? '有' : '无';
+            },
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'aBomStatus',
+            label: 'ABOM状态',
+            align: 'center',
+            minWidth: 120,
+            formatter: (row, column) => {
+              return row.aBomStatus == 1 ? '有' : '无';
+            },
+            showOverflowTooltip: true
+          },
           {
             prop: 'isUnpack',
             label: '是否允许拆包',

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

@@ -19,7 +19,7 @@
             clearable
             size="small"
             v-model.trim="where.searchKey"
-            placeholder="型号、牌号"
+            placeholder="型号、规格、牌号"
           />
         </el-form-item>
       </el-col>

src/views/technology/production/index.vue

@@ -263,6 +263,10 @@
         controlList: [],
 
         typeList: [
+          {
+            value: 99,
+            label: '关键工序'
+          },
           {
             value: 1,
             label: '普通工序'

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

@@ -103,6 +103,11 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="排序:" prop="sort">
+            {{ form.sort }}
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
 
@@ -250,7 +255,7 @@
             size: -1
           });
 
-          let arr = res.list.map((it) => {
+          let arr = res?.list?.map((it) => {
             it.detail.orderNum = it.orderNum;
             return it.detail;
           });

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

@@ -88,7 +88,11 @@
             </el-select>
           </el-form-item>
         </el-col>
-
+        <el-col :span="8">
+          <el-form-item label="排序:" prop="sort">
+            <el-input  v-model="form.sort" type="number" />
+          </el-form-item>
+        </el-col>
         <!-- <el-col :span="8">
           <el-form-item label="类型:" prop="routeType">
             <el-select v-model="form.routeType" placeholder="请选择">

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

@@ -368,13 +368,12 @@
           });
 
           console.log(res, '_________res');
-          let arr = res.list.map((it) => {
+          let arr = res?.list?.map((it) => {
             it.detail.orderNum = it.orderNum;
 
             return it.detail;
-          });
+          })||[];
 
-          console.log(arr, '_____arr');
           this.$refs.table.setData([...arr]);
         }
       },

src/views/technology/route/index.vue

@@ -207,6 +207,13 @@
           //   align: 'center',
           //   showOverflowTooltip: true
           // },
+          {
+            prop: 'sort',
+            label: '排序',
+            showOverflowTooltip: true,
+            align: 'center',
+            width: 110,
+          },
           {
             prop: 'code',
             label: '工艺路线编码',

src/views/workforceManagement/team/components/edit.vue

@@ -99,7 +99,7 @@
               </el-select>
             </el-form-item>
           </el-col> -->
-          <el-col :span="8" style="margin-bottom: 22px">
+          <!-- <el-col :span="8" style="margin-bottom: 22px">
             <el-form-item label="产线:" prop="productionLineId">
               <el-select
                 v-model="form.productionLineId"
@@ -115,7 +115,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="8" style="margin-bottom: 22px">
             <el-form-item label="工作中心:" prop="workCenterId">
               <div class="location-warp">
@@ -215,7 +215,7 @@
           code: '',
           leaderUserId: '',
           name: '',
-          productionLineId: [],
+          // productionLineId: [],
           userIds: '',
           userNumber: '',
           // workshopPlanId: null,
@@ -249,9 +249,9 @@
             { required: true, message: '请选择所属工厂', trigger: 'change' }
           ],
 
-          productionLineId: [
-            { required: true, message: '请输入', trigger: 'change' }
-          ],
+          // productionLineId: [
+          //   { required: true, message: '请输入', trigger: 'change' }
+          // ],
 
           workCenterId: [
             { required: true, message: '请选择工作中心', trigger: 'change' }
@@ -262,7 +262,7 @@
         loading: false,
         options: {
           workshopId: [],
-          productionLineId: [],
+          // productionLineId: [],
           workCenterList: []
         },
 
@@ -317,7 +317,7 @@
           // 获取下拉列表
           // await this.getlistWorkshopByParentId();
           // await this.getlistCf();
-          await this.getlistFactoryLineByParentId();
+          // await this.getlistFactoryLineByParentId();
           await this.getlistByProductionLineId();
         }
         if (type != 'edit') {
@@ -396,11 +396,11 @@
         this.workshopPlanList = [];
         // this.form.workshopId = '';
         this.options.workshopId = [];
-        this.form.productionLineId = '';
-        this.options.productionLineId = [];
+        // this.form.productionLineId = '';
+        // this.options.productionLineId = [];
 
         // this.getlistCf();
-        this.getlistFactoryLineByParentId();
+        // this.getlistFactoryLineByParentId();
         this.form.workCenterId = null;
         this.form.workCenterIds = [];
         this.options.workCenterList = [];
@@ -469,18 +469,18 @@
       change_workshopPlanId() {
         this.form.workshopId = '';
         this.options.workshopId = [];
-        this.form.productionLineId = '';
-        this.options.productionLineId = [];
+        // this.form.productionLineId = '';
+        // this.options.productionLineId = [];
 
         this.getlistWorkshopByParentId();
       },
       // 选择车间
       change_workshopId() {
-        this.form.productionLineId = '';
+        // this.form.productionLineId = '';
 
-        this.options.productionLineId = [];
+        // this.options.productionLineId = [];
 
-        this.getlistFactoryLineByParentId();
+        // this.getlistFactoryLineByParentId();
       },
 
       async getVersionList() {

src/views/workforceManagement/team/index.vue

@@ -124,10 +124,10 @@
           //   prop: 'workshopPlanName'
           // },
 
-          {
-            label: '所属产线',
-            prop: 'productionLineName'
-          },
+          // {
+          //   label: '所属产线',
+          //   prop: 'productionLineName'
+          // },
           {
             label: '工作中心',
             prop: 'workCenterNames'

vue.config.js

@@ -37,12 +37,10 @@ module.exports = {
         // target: 'http://192.168.1.176:18086',
 
         // target: 'http://192.168.1.251:18086',
-        // target: 'http://192.168.1.125:18086',
-        // target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186',
 
         // target: 'http://192.168.1.251:18087',
-        // target: 'http://192.168.1.251:18086',
 
         target: 'http://192.168.1.116:18086',