snow 2 years ago
parent
commit
8bc2b9f9b2

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/0.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.js


+ 1 - 1
src/apis/service/sellOut/sellAfterApply/index.js

@@ -20,7 +20,7 @@ export default {
   aftersetwsm: (data, params) => http(api + 'aftersetwsm', data, 'post', params),
   // 售后快递录入
   afterPost: (data, params) => http(api + 'afterpost ', data, 'post', params),
-  afterChild: (data, params) => http(api + 'order_return_child_list ', data, 'post', params),
+  afterChild: (data, params) => http(api + 'order_return_child_prelist ', data, 'post', params),
   express: (data, params) => http(api + 'setdelivery ', data, 'post', params),
   sendList: (data, params) => http(api + 'child_out_get_list ', data, 'post', params),
   reorderChildAdd: (data, params) => http(api + 'reorder_child_add ', data, 'post', params),

+ 6 - 3
src/components/globalComponents/digital-input/main.vue

@@ -56,9 +56,12 @@ export default {
     }
   },
   watch: {
-    values: function(val) {
-      // console.log(this.name + "=" + val);
-      this.num = val
+    values: {
+      handler: function(val) {
+        this.num = val
+        this.$emit('reschange', val)
+      },
+      immediate: true
     },
     newTime: function(val) {
       if (val) {

+ 0 - 3
src/views/goodStore/supplierGoodsCost/index.vue

@@ -278,9 +278,6 @@
             "
           ></i>
         </el-tooltip>
-        <!-- &&
-            ((scope.row.has_account + '' == '0' && scope.row.is_stock + '' === '0') ||
-              scope.row.is_stock + '' === '1') -->
         <el-tooltip
           v-if="
             ppowers.some((i) => i == '4') &&

+ 1 - 1
src/views/sellOut/sellAfterApply/components/set-work-order.vue

@@ -186,7 +186,7 @@ export default {
         if (!isValid) return
         let sum = 0
         const list = this.list.map(({ outChildCode, return_num, return_wsm_code }) => {
-          sum += return_num
+          sum += Number(return_num)
           return {
             return_num,
             outChildCode,

+ 6 - 3
src/views/sellOut/sellReturn/components/set-work-order.vue

@@ -25,7 +25,7 @@
                 <span>{{ scope.row.wsm_name }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="num" width="80px" label="发货数量" show-overflow-tooltip />
+
             <el-table-column width="110px" show-overflow-tooltip>
               <template slot="header">
                 <span style="color:red;margin-right:2px">*</span>退货数量
@@ -42,6 +42,7 @@
                     :size="'mini'"
                     :controls="false"
                     :append="''"
+                    :new-time="newTime"
                     @reschange="onNumberChange($event, scope.$index)"
                   />
                 </el-form-item>
@@ -117,6 +118,7 @@ export default {
     loading: false,
     subLoading: false,
     setWorkOrderColumns,
+    newTime: null,
     formData: {
       return_wsm_code: '',
       return_num: '0'
@@ -124,7 +126,6 @@ export default {
   }),
   computed: {
     confirmText() {
-      console.log(Number(this.workOrderCount), Number(this.currentWorkOrder))
       return Number(this.workOrderCount) === Number(this.currentWorkOrder) ? '保存' : '保存当前设置'
     },
     state() {
@@ -173,7 +174,7 @@ export default {
         case 0:
           this.list = data.map(item => ({
             ...item,
-            return_num: 0,
+            return_num: this.outItem ? Number(this.outItem.return_num) : 0,
             return_wsm_code: this.sitem.order_type === '1' ? [item.wsm_code] : '' }
           ))
           break
@@ -181,6 +182,8 @@ export default {
           this.$message.warning(message)
           break
       }
+
+      this.newTime = new Date().valueOf()
     },
     onStockChange({ code, supplierName, supplierNo, contactor } = {}, index) {
       this.$set(this.list, index, {

Some files were not shown because too many files changed in this diff