Procházet zdrojové kódy

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

lucw před 3 dny
rodič
revize
fb3234efd3

+ 12 - 0
src/BIZComponents/inventoryTableDetails.vue

@@ -149,6 +149,10 @@
       timeDialog
     },
     props: {
+      isReelSpecification: {
+        type: Boolean,
+        default: false
+      },
       // 是否显示「操作」列(BOM详情):只有报价单审批详情传 true,其它单据不受影响
       showBomDetail: {
         default: false,
@@ -683,6 +687,14 @@
             align: 'center',
             formatter: (row) => row.systemBatchNo || '-'
           },
+          {
+            width: 150,
+            prop: 'reelSpecification',
+            label: '盘具',
+            isNone: !this.isReelSpecification,
+            showOverflowTooltip: true,
+            align: 'center'
+          },
           {
             width: 160,
             prop: 'productBrand',

+ 1 - 0
src/views/bpm/handleTask/components/saleOrder/detailDialog.vue

@@ -242,6 +242,7 @@
       <inventoryTabledetail
         v-if="form.needProduce != 4"
         ref="inventoryTabledetailRef"
+        :isReelSpecification="form.needProduce == 0"
         :isCustomerMark="true"
         :isDiscountTotalPrice="true"
         @price-change="handlePriceChange"

+ 7 - 0
src/views/bpm/handleTask/components/saleOrder/invoice/detailDialog.vue

@@ -344,6 +344,13 @@
             align: 'center',
             formatter: (row) => row.systemBatchNo || '-'
           },
+          {
+            width: 150,
+            prop: 'reelSpecification',
+            label: '盘具',
+            showOverflowTooltip: true,
+            align: 'center'
+          },
           {
             width: 160,
             prop: 'productBrand',

+ 2 - 2
vue.config.js

@@ -38,13 +38,13 @@ module.exports = {
         // target: 'http://124.71.68.31:50001', // 测试环境
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.105:18086',
-        // target: 'http://localhost:18086',
+        target: 'http://localhost:18086',
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.3:18086',
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.3:18086',
-        target: 'https://aiot.zoomwin.com.cn:51001/api',
+        // target: 'https://aiot.zoomwin.com.cn:51001/api',
         // target: 'http://192.168.1.3:18086',
         // target: 'http://192.168.1.9:18086', // 陈兵
         // target: 'http://192.168.1.116:18086', // 赵沙金