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

src/views/saleOrder/components/order-detail.vue

@@ -304,7 +304,8 @@
           salesOrderAllProductsList: [],
           salesOrderBasicInfo: {}
         },
-        orderWeight: ''
+        orderWeight: '',
+        currentRowInfo: null
       };
     },
     computed: {
@@ -326,6 +327,7 @@
     },
     methods: {
       open(row) {
+        this.currentRowInfo = row;
         this.getDetail(row.id);
         this.orderWeight = `${row.productSumWeight}${row.weightUnit}`;
         this.visible = true;
@@ -344,6 +346,7 @@
           if (typeof res.salesOrderAllProductsList != 'string') {
             this.form.salesOrderAllProductsList = res.salesOrderAllProductsList;
           }
+          console.log('this.form', this.form);
         });
       },
       cancel() {

src/views/saleOrder/components/orderHomogeneityInspectDialog.vue

@@ -49,8 +49,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="编号:">
-                <el-input readonly v-model="orderInfo.productCode"></el-input>
+              <el-form-item label="行号:">
+                <el-input readonly v-model="orderInfo.lineNumber"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">

src/views/saleOrder/index.vue

@@ -491,9 +491,9 @@
         }
         for (let i = 0; i < this.selection.length; i++) {
           let el = this.selection[i];
-          if (!el.bomCategoryId) {
-            return this.$message.warning('请选择有BOM版本的数据');
-          }
+          // if (!el.bomCategoryId) {
+          //   return this.$message.warning('请选择有BOM版本的数据');
+          // }
         }
 
         let codeList = [];

src/views/saleOrder/salesToProductionNew.vue

@@ -436,13 +436,13 @@
     },
     methods: {
       async getProducedData() {
-        console.log(3333333333333333333333333)
+        console.log(3333333333333333333333333);
         let query = this.$route.query;
         let producedList = query.producedList
           ? JSON.parse(query.producedList)
           : [];
         console.log(query, 'query');
-        console.log(producedList,'producedList');
+        console.log(producedList, 'producedList');
         // this.form.produceType = query.produceType || 2;
         if (!producedList || producedList.length === 0) {
           this.producedList = [

src/views/saleOrder/salesToProductionNewTwo.vue

@@ -847,6 +847,7 @@
   import { getCode } from '@/api/codeManagement';
   import dayjs from 'dayjs';
   import { debounce } from 'lodash';
+  import { log } from 'bpmn-js-token-simulation';
   export default {
     mixins: [dictMixins],
     components: {
@@ -1036,7 +1037,7 @@
       },
       async getProducedData() {
         console.log(111111111111111);
-        let query = this.$route.query;
+        let query = {...this.$route.query };
         console.log(query, 'query');
 
         if (!query.producedList || query.producedList.length == 0) {
@@ -1051,7 +1052,7 @@
       },
       // 初始化时间赋值
       initTime() {
-        let data = this.$route.query;
+        let data = {...this.$route.query };
         if (data.startTime) {
           this.$set(this.form, 'startTime', data.startTime);
         }
@@ -1181,7 +1182,7 @@
           if (res.length) {
             let o = res[0];
             if (type == 'init') {
-              let query = this.$route.query;
+              let query = {...this.$route.query };
               let id = query.bomCategoryId ? query.bomCategoryId : o.id;
               this.$set(this.form, 'bomCategoryId', id);
             } else {
@@ -1209,7 +1210,7 @@
         this.form.produceVersionName = '';
         this.selectionRowShow = false; // ****
         if (type == 'init') {
-          let queryD = this.$route.query;
+          let queryD = {...this.$route.query };
           if (queryD.produceRoutingId && !queryD.bomCategoryId) {
             this.form.produceRoutingName = queryD.produceRoutingName;
             this.form.produceRoutingId = queryD.produceRoutingId;
@@ -1252,7 +1253,6 @@
       getSaleInfo() {
         let params = JSON.parse(this.$route.query.selection);
         productionToPlan(params).then((res) => {
-          console.log(this.$route.query);
           this.form = deepClone(res);
           console.log(222222222222222222222222, '===');
           this.initTime();
@@ -1270,7 +1270,7 @@
           this.form.produceType = this.$route.query.produceType
             ? parseInt(this.$route.query.produceType)
             : res.produceType;
-          console.log(this.form.produceType, '这里吗');
+          console.log('this.form', this.form, res);
           this.changeProduceType('init');
           this.form.bomCategoryId =
             res.bomCategoryId || this.$route.query.bomCategoryId;
@@ -1526,7 +1526,7 @@
         this.changeData();
       },
       addEquipment() {
-        let query = this.$route.query;
+        let query = {...this.$route.query };
         let orderType = query.orderType;
         let arr = this.form.salesOrders;
         if (arr && arr.length > 0) {
@@ -1637,7 +1637,7 @@
 
         row.requiredFormingNum = Number(
           row.planProductNum * (this.form.marginCoefficient || 1)
-        ).toFixed(5);
+        ).toFixed(0);
       },
       confirmChoose(list) {
         // 取出在弹窗中选中并且不在表格中的数据

src/views/workOrder/index.vue

@@ -28,7 +28,6 @@
         :datasource="datasource"
         :parse-data="parseData"
         autoAmendPage
-        cache-key="workOrderTable"
         row-key="id"
         @sort-change="onSortChange"
         @columns-change="handleColumnChange"

vue.config.js

@@ -38,8 +38,8 @@ module.exports = {
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.144:18086',
         // target: 'http://192.168.1.211:18086',
-        // target: 'http://192.168.1.251:18186',
-        target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.251:18186',
+        // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.116:18086',
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域