yusheng преди 10 месеца
родител
ревизия
91c3ed69e3

+ 3 - 3
src/views/purchasingManage/purchaseOrder/components/detailDialog.vue

@@ -59,7 +59,7 @@
             <el-form-item
               v-if="form.relationType == 1"
               label="采购需求单"
-              prop="purchasePlanName"
+              prop="relationName"
             >
               <el-input
                 disabled
@@ -70,7 +70,7 @@
             <el-form-item
               v-if="form.relationType == 2"
               label="采购计划单"
-              prop="purchasePlanName"
+              prop="relationName"
             >
               <!--            <el-input-->
               <!--              @click.native="handPurchasePlan"-->
@@ -86,7 +86,7 @@
             <el-form-item
               v-if="form.relationType == 3"
               label="采购核价单"
-              prop="purchasePlanName"
+              prop="relationName"
             >
               <el-input
                 disabled

+ 2 - 2
src/views/purchasingManage/purchaseOrder/invoice/components/inventoryTable.vue

@@ -531,7 +531,7 @@
           {
             width: 150,
             prop: 'purchaseCount',
-            label: '数量',
+            label: '收货数量',
             slot: 'purchaseCount',
             headerSlot: 'headerTotalCount',
             align: 'center'
@@ -554,7 +554,7 @@
           {
             width: 120,
             prop: 'totalCount',
-            label: '收货数量',
+            label: '计量数量',
             // slot: 'totalCount',
             // headerSlot: 'headerTotalCount',
             align: 'center'

+ 3 - 3
src/views/purchasingManage/purchaseOrder/outSourceSend/components/detailDialog.vue

@@ -271,7 +271,7 @@
           {
             width: 150,
             prop: 'purchaseCount',
-            label: '数量',
+            label: '发货数量',
             slot: 'purchaseCount',
             headerSlot: 'headerTotalCount',
             align: 'center'
@@ -294,8 +294,8 @@
           {
             width: 120,
             prop: 'totalCount',
-            label: '发货数量',
-            slot: 'totalCount',
+            label: '计量数量',
+            // slot: 'totalCount',
             align: 'center'
           },
           {

+ 4 - 4
src/views/purchasingManage/purchaseOrder/outSourceSend/components/inventoryTable.vue

@@ -393,7 +393,7 @@
           {
             width: 150,
             prop: 'purchaseCount',
-            label: '数量',
+            label: '发货数量',
             slot: 'purchaseCount',
             headerSlot: 'headerTotalCount',
             align: 'center'
@@ -415,9 +415,9 @@
           {
             width: 100,
             prop: 'totalCount',
-            label: '发货数量',
-            slot: 'totalCount',
-            headerSlot: 'headerTotalCount',
+            label: '计量数量',
+            // slot: 'totalCount',
+            // headerSlot: 'headerTotalCount',
             align: 'center'
           },
           // {

+ 2 - 2
src/views/saleManage/saleOrder/invoice/components/inventoryTable.vue

@@ -635,7 +635,7 @@
           {
             width: 150,
             prop: 'saleCount',
-            label: '数量',
+            label: '发货数量',
             slot: 'saleCount',
             headerSlot: 'headerTotalCount',
             align: 'center'
@@ -658,7 +658,7 @@
           {
             width: 120,
             prop: 'totalCount',
-            label: '发货数量',
+            label: '计量数量',
             // slot: 'totalCount',
             // headerSlot: 'headerTotalCount',
             align: 'center'

+ 4 - 4
src/views/saleManage/saleOrder/invoice/components/inventoryTableDetails.vue

@@ -183,7 +183,7 @@
           {
             width: 150,
             prop: 'saleCount',
-            label: '数量',
+            label: '发货数量',
             slot: 'saleCount',
             headerSlot: 'headerTotalCount',
             align: 'center'
@@ -206,9 +206,9 @@
           {
             width: 120,
             prop: 'totalCount',
-            label: '发货数量',
-            slot: 'totalCount',
-            headerSlot: 'headerTotalCount',
+            label: '计量数量',
+            // slot: 'totalCount',
+            // headerSlot: 'headerTotalCount',
             align: 'center'
           },
           {

+ 1 - 1
vue.config.js

@@ -41,7 +41,7 @@ module.exports = {
         // target: 'http://192.168.1.139:18086', // 粟
         // target: 'http://192.168.1.132:18086', // 徐1
         // target: 'http://192.168.1.134:18086', //徐2
-        target: 'http://192.168.1.158:18086',
+        target: 'http://192.168.1.105:18086',
         // target: 'http://192.168.1.103:18086',
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.105:18086',