fix: bug

src/components/ReturnSalesHeader/ReturnSalesHeader.vue

@@ -46,7 +46,7 @@
         </el-col>
         <el-col :span="details.id?8:24" class="item">
           <div class="label">发货仓库名称</div>
-          <div class="value">{{ storeObj[details.stockType] || '' }}</div>
+          <div class="value">{{storeObj[details.stockType]}}</div>
         </el-col>
         <el-col :span="24" class="item">
           <div class="label">退货备注</div>
@@ -71,7 +71,7 @@ export default {
   data() {
     return {
       storeObj: {
-        1: '前置仓', 2: '商家仓'
+        1: '嘉贤前置仓', 2: '商家自提仓'
       }
     }
   },

src/components/SalesDialog/SalesDialog.vue

@@ -7,6 +7,7 @@
         :get-list="getList"
         :table-attributes="tableAttributes"
         :table-events="tableEvents"
+        :replace-or-not-map="false"
       />
       <span slot="footer" class="dialog-footer">
         <el-button size="mini" @click="$parent.dialogVisible = false">取 消</el-button>

src/views/sales_control/sales_management/components/customer_sales_details.vue

@@ -16,7 +16,7 @@
         </el-button>
       </template>
     </sales-table>
-    <LogisticsTabs v-if="details.status == 2 " style="margin:20px;" :details-id="detailsId" />
+    <LogisticsTabs v-if="details.status == 2 && details.stockType == 1 " style="margin:20px;" :details-id="detailsId" />
     <sales-dialog
       :dialog-visible="dialogVisible"
       :customer-number="customerNumber"

src/views/sales_control/sales_management/components/customer_sales_form.vue

@@ -278,6 +278,10 @@ export default {
       this.dialogVisible = true
     },
     handelSubmit(type, status = 1) {
+      if (!this.$refs.header.screenForm.stockType) {
+        this.$errorMsg('请选择仓库')
+        return
+      }
       if (!this.dataList.length) {
         this.$errorMsg('请添加产品')
         return
@@ -295,6 +299,7 @@ export default {
         ...this.$refs.header.screenForm,
         orders: this.dataList,
         status: status
+
       }
       this.$refs.header.$refs.form.validate(valid => {
         if (valid) {

src/views/sales_control/sales_management/components/return_sales_details.vue

@@ -23,11 +23,10 @@
         <div v-if="!detailsId">
           <el-button type="primary" :disabled="!dis" size="mini" @click="handelSubmit(1)">提交</el-button>
           <el-button v-if="dis" size="mini" @click="onReset">重置</el-button>
-          <el-button v-if="details.stockType ===1" size="mini" :disabled="dis" @click="handleInform(2)">退货通知</el-button>
+          <el-button v-if="details.stockType ===1 && details.status == 1" size="mini" :disabled="dis" @click="handleInform(2)">退货通知</el-button>
         </div>
         <div v-else>
-          <el-button type="primary" size="mini" @click="handelSubmit(2)">保存</el-button>
-          <el-button v-if="!detailsId" size="mini" @click="onReset">重置</el-button>
+          <el-button v-if="(details.status == 2 && details.stockType == 1)" size="mini" @click="handleSendRevoke(1)">撤销发货</el-button>
         </div>
       </template>
       <template v-slot:custom="{ item: { row, $index } }">
@@ -43,6 +42,8 @@
         </el-popconfirm>
       </template>
     </sales-table>
+    <LogisticsTabs v-if="details.stockType == 1 " style="margin:20px;" :details-id="detailsId" />
+
     <sales-dialog
       ref="dia"
       :data-list="dataList"
@@ -59,12 +60,15 @@
 import SalesDialog from '@/components/SalesDialog/SalesDialog'
 import ReturnSalesHeader from '@/components/ReturnSalesHeader/ReturnSalesHeader'
 import SalesTable from '@/components/SalesTable/SalesTable'
+import LogisticsTabs from '@/components/LogisticsTabs'
+
 import {
   detailRefund,
   addRefund,
   sendRefund,
   updateRefund,
-  listOrder
+  listOrder,
+  setSendRevoke
 } from '@/api/sales'
 
 export default {
@@ -72,7 +76,8 @@ export default {
   components: {
     ReturnSalesHeader,
     SalesTable,
-    SalesDialog
+    SalesDialog,
+    LogisticsTabs
   },
   props: ['detailsId', 'pageType'],
   data() {
@@ -243,6 +248,12 @@ export default {
     resArr(arr1, arr2) {
       return arr1.filter(v => arr2.every(val => val.id != v.id))
     },
+    handleSendRevoke(status) {
+      setSendRevoke({ id: this.detailsId, status }).then(res => {
+        this.$successMsg('撤销发货')
+        this.handleBack()
+      })
+    },
     delChange() {
       if (this.dataList.length) {
         for (let i = 0; i < this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData.length; i++) {

src/views/sales_control/sales_management/components/return_sales_form.vue

@@ -24,14 +24,9 @@
           <el-button v-if="!detailsId" type="primary" :disabled="!dis" size="mini" @click="handelSubmit(1)">提交</el-button>
           <el-button v-else type="primary" size="mini" @click="handelSubmit(2)">提交</el-button>
           <el-button v-if="dis" size="mini" @click="onReset">重置</el-button>
-          <el-button v-if="details.stockType ==1 && !detailsId" size="mini" :disabled="dis" @click="handleInform(2)">退货通知</el-button>
-          <el-button v-if="details.stockType ==2 && detailsId" size="mini" @click="handleInform(2)">退货通知</el-button>
-
+          <el-button v-if="$refs.header.details.stockType ==1" size="mini" :disabled="dis" @click="handleInform(2)">退货通知</el-button>
         </div>
-        <!-- <div v-else>
-          <el-button type="primary" size="mini" @click="handelSubmit(2)">保存</el-button>
-          <el-button v-if="!detailsId" size="mini" @click="onReset">重置</el-button>
-        </div> -->
+
       </template>
       <template v-slot:custom="{ item: { row, $index } }">
         <div>{{ diffQty(row) }}</div>
@@ -144,6 +139,7 @@ export default {
   },
   created() {
     if (this.detailsId) {
+      this.dis = false
       detailRefund({ id: this.detailsId }).then(res => {
         this.dataList = res.data.orders
         this.details = res.data
@@ -163,13 +159,6 @@ export default {
 
   methods: {
     getDialogList(p) {
-      // let func = getcustomerFrontList
-      // if (this.isFront===true){
-      //   func = getcustomerFrontList
-      // }
-      // if (this.isFront===false){
-      //   func = getFrontListCustomer
-      // }
       return listOrder(...p)
     },
     confirm(selected) {
@@ -201,7 +190,6 @@ export default {
           }
         }
       }
-      console.log(this.$refs.dia.$refs.pageRef.$refs.zjpage.$refs.tableEl.tableData)
       selected.forEach(k => {
         k.diffQty = Number(k.qty) - Number(k.refundQty)
         k.qty = k.refundQty
@@ -212,6 +200,7 @@ export default {
       if (!this.detailsId) {
         this.details = this.dataList[0]
         this.details.customerOrderNo = obj.id
+        this.details.stockType = this.details.stockType == '嘉贤前置仓' ? 1 : 2
       }
 
       this.returnId = obj.id
@@ -299,6 +288,7 @@ export default {
         orders: list,
         customerOrderNo: this.details.customerOrderNo,
         status
+
       }
       if (type === 1) {
         params.id = ''

src/views/supply/transferOrder/transferOrderForm.vue

@@ -985,6 +985,12 @@ export default {
     },
     onSubmit(type = null) {
       this.$refs.formRef.validate(valid => {
+        for (let i = 0; i < this.selectData.length; i++) {
+          if (this.selectData[i].qty <= 0) {
+            this.$errorMsg('调拨数量不能小于1')
+            return
+          }
+        }
         if (valid) {
           const params = {
             ...this.formData,