【修改】

1.零售单
2.发货单

src/api/supply/deliver.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
-// 获取列表
-export function getList(params) {
+// 获取列表 - 零售发货单
+export function getDeliverList(params) {
   return request({
     url: '/ship/list',
     method: 'get',
@@ -9,11 +9,29 @@ export function getList(params) {
   })
 }
 
-// 获取详情
-export function getDetail(params) {
+// 获取详情 - 零售发货单
+export function getDeliverDetail(params) {
   return request({
     url: '/ship/detail',
     method: 'get',
     params
   })
+}
+
+// 获取列表 - 工程发货单
+export function getEnginList(params) {
+  return request({
+    url: '/ship/listProject',
+    method: 'get',
+    params
+  })
+}
+
+// 获取详情 - 工程发货单
+export function getEnginDetail(params) {
+  return request({
+    url: '/ship/detailProject',
+    method: 'get',
+    params
+  })
 }

src/api/supply/retail.js

@@ -36,15 +36,6 @@ export function examineData(params) {
   })
 }
 
-// 退订
-export function returnData(params) {
-  return request({
-    url: '/retail/return',
-    method: 'post',
-    params
-  })
-}
-
 // 提交审核
 export function submitData(params) {
   return request({
@@ -72,6 +63,15 @@ export function editData(params) {
   })
 }
 
+// 退订
+export function returnData(params) {
+  return request({
+    url: '/retail/tuiding',
+    method: 'post',
+    data: params
+  })
+}
+
 // 获取销售类型列表
 export function getSalesTypeList(params) {
   return request({

src/views/supply/deliver/components/deliver_detail.vue

@@ -159,7 +159,7 @@
 
 <script>
 import print from 'vue-print-nb'
-import { getDetail } from "@/api/supply/return";
+import { getDeliverDetail } from "@/api/supply/return";
 
 export default {
   name: 'DeliverDetail',
@@ -201,7 +201,7 @@ export default {
 
     // 获取详情
     getDetail() {
-      getDetail({id: this.listItem.id}).then(res => {
+      getDeliverDetail({id: this.listItem.id}).then(res => {
         this.detailData = res.data;
       })
     },

src/views/supply/deliver/components/engin_detail.vue

@@ -159,7 +159,7 @@
 
 <script>
 import print from 'vue-print-nb'
-import { getDetail } from "@/api/supply/return";
+import { getEnginDetail } from "@/api/supply/return";
 
 export default {
   name: 'EnginDetail',
@@ -201,7 +201,7 @@ export default {
 
     // 获取详情
     getDetail() {
-      getDetail({id: this.listItem.id}).then(res => {
+      getEnginDetail({id: this.listItem.id}).then(res => {
         this.detailData = res.data;
       })
     },

src/views/supply/deliver/deliver_list.vue

@@ -107,7 +107,7 @@
 
 <script>
 import { COMMON_SELECT } from '@/utils/select_data'
-import { getList } from "@/api/supply/deliver";
+import { getDeliverList } from "@/api/supply/deliver";
 import DeliverDetail from "@/views/supply/deliver/components/deliver_detail";
 
 export default {
@@ -137,14 +137,13 @@ export default {
   computed: {
     exParams() {
       return {
-        retreatOrderNo: this.screenForm.orderNum,
+        id: this.screenForm.orderNum,
         customerNumber: this.screenForm.jxsNum,
         customerName: this.screenForm.jxsName,
         productName: this.screenForm.chName,
         specification: this.screenForm.model,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
-        status: 1, // 1:发货单，2:工程发货单
       }
     },
     isShowDetail() {
@@ -173,16 +172,15 @@ export default {
       let params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
-        retreatOrderNo: this.screenForm.orderNum,
+        id: this.screenForm.orderNum,
         customerNumber: this.screenForm.jxsNum,
         customerName: this.screenForm.jxsName,
         productName: this.screenForm.chName,
         specification: this.screenForm.model,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
-        status: 1, // 1:发货单，2:工程发货单
       };
-      getList(params).then((res) => {
+      getDeliverList(params).then((res) => {
         this.dataList = res.data.records;
         this.listTotal = res.data.total;
         this.listLoading = false;

src/views/supply/deliver/engin_list.vue

@@ -135,7 +135,7 @@
 
 <script>
 import { COMMON_SELECT } from '@/utils/select_data'
-import { getList } from "@/api/supply/deliver";
+import { getEnginList } from "@/api/supply/deliver";
 import EnginDetail from "@/views/supply/deliver/components/engin_detail";
 
 export default {
@@ -170,14 +170,14 @@ export default {
   computed: {
     exParams() {
       return {
-        retreatOrderNo: this.screenForm.orderNum,
+        id: this.screenForm.orderNum,
         customerNumber: this.screenForm.jxsNum,
         customerName: this.screenForm.jxsName,
         productName: this.screenForm.chName,
         specification: this.screenForm.model,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
-        status: 2, // 1:发货单，2:工程发货单
+        orderType: 2, // 2家用工程 3商用工程
       }
     },
     isShowDetail() {
@@ -206,16 +206,16 @@ export default {
       let params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
-        retreatOrderNo: this.screenForm.orderNum,
+        id: this.screenForm.orderNum,
         customerNumber: this.screenForm.jxsNum,
         customerName: this.screenForm.jxsName,
         productName: this.screenForm.chName,
         specification: this.screenForm.model,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
-        status: 2, // 1:发货单，2:工程发货单
+        orderType: 2, // 2家用工程 3商用工程
       };
-      getList(params).then((res) => {
+      getEnginList(params).then((res) => {
         this.dataList = res.data.records;
         this.listTotal = res.data.total;
         this.listLoading = false;

src/views/supply/retail/components/retail_detail.vue

@@ -77,10 +77,10 @@
         <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="返利类型" prop="walletRebateName" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="返利钱包" prop="customerWalletName2" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="返利金额" prop="rebateAmount" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="格力折扣" prop="deductAmount" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="现金钱包" prop="walletRebateName2" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="现金钱包" prop="customerWalletName" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="实付金额" prop="payAmount" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -162,7 +162,8 @@
         <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="订单数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="发货数量" prop="hasSendQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="直调数量" prop="adjustNum" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.adjustNum" size="small" type="number"></el-input>

src/views/supply/retail/components/retail_form.vue

@@ -164,7 +164,7 @@
         <el-row :gutter="20">
           <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item prop="type">
-              <el-select v-model="screenForm.type" placeholder="选择品类" style="width: 100%">
+              <el-select v-model="mainForm.type" placeholder="选择品类" style="width: 100%">
                 <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
               </el-select>
             </el-form-item>

src/views/supply/retail/components/retail_return.vue

@@ -58,10 +58,10 @@
         <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="返利类型" prop="walletRebateName" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="返利钱包" prop="customerWalletName2" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="返利金额" prop="rebateAmount" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="格力折扣" prop="deductAmount" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="现金钱包" prop="walletRebateName2" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="现金钱包" prop="customerWalletName" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="实付金额" prop="payAmount" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -69,7 +69,12 @@
           </template>
         </el-table-column>
         <el-table-column align="center" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="原订单数量" prop="oldQty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="可退数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="退订数量" prop="tdQty" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.tdQty" size="small" type="number"></el-input>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="税率" prop="tax" min-width="100" show-overflow-tooltip></el-table-column>
       </el-table>
@@ -88,10 +93,10 @@
           <div class="label">退订日期</div>
           <div class="value">{{nowDate}}</div>
         </el-col>
-        <el-col :span="24" class="item">
+        <!-- <el-col :span="24" class="item">
           <div class="label">退订说明</div>
           <div class="value"><el-input v-model="mainForm.remark" placeholder="请输入内容"></el-input></div>
-        </el-col>
+        </el-col> -->
       </el-row>
     </div>
     
@@ -131,7 +136,6 @@ export default {
 
       formLoading: false,
       mainForm: {
-        status: true,
         remark: '',
       }
     }
@@ -181,13 +185,26 @@ export default {
       })
     },
 
-    // 提交审批
+    // 提交
     clickSubmitForm() {
+      for(let i=0; i<this.detailData.retailOrderItemList.length; i++) {
+        if(this.detailData.retailOrderItemList[i].tdQty === '' || this.detailData.retailOrderItemList[i].tdQty === null) {
+          this.$errorMsg('请填写退订数量');
+          return;
+        }
+        if(Number(this.detailData.retailOrderItemList[i].tdQty) < 0) {
+          this.$errorMsg('退订数量不可为负数');
+          return;
+        }
+      }
+
       this.formLoading = true;
       returnData({
         id: this.listItem.id,
-        examineStatus: this.mainForm.status ? 'OK' : 'FAIL',
-        examineRemark: this.mainForm.remark,
+        type: 1, // 1:普通零售单，2:政策零售单
+        // examineRemark: this.mainForm.remark,
+        theTime: this.detailData.theTime,
+        retailOrderItemList: this.detailData.retailOrderItemList
       }).then(res => {
         this.$successMsg('退订成功');
         this.goBack();