修改bug

src/components/bill/config/mainLists.json

@@ -43,7 +43,7 @@
   ],
   "column": [
     {
-      "label": "销售单号",
+      "label": "业务编号",
       "prop": "ordNo",
       "overHidden": true,
       "search": true,

src/components/bill/config/mainListsCG.json

@@ -43,7 +43,7 @@
   ],
   "column": [
     {
-      "label": "采购单号",
+      "label": "业务编号",
       "prop": "ordNo",
       "overHidden": true,
       "search": true,

src/views/approveDataL/index.vue

@@ -55,8 +55,9 @@
         <span v-else-if="scope.row.checkType == 'HYJK-FY'">海运进口费用</span>
         <span v-else-if="scope.row.checkType == 'XSTD'">销售退单请核</span>
         <span v-else-if="scope.row.checkType == 'YPJ-XSTH'">销售退款退货</span>
-        <span v-else-if="scope.row.checkType == 'PJTK'">售后</span>
+        <span v-else-if="scope.row.checkType == 'PJTK'">销售退货</span>
         <span v-else-if="scope.row.checkType == 'PJCG'">采购</span>
+        <span v-else-if="scope.row.checkType == 'PJCGTK'">采购退货</span>
       </template>
       <!-- <template slot="menuLeft">
         <el-button size="small" type="success" :disabled="selectionList.length == 0" @click.stop="batchCheck">批量审批

src/views/tirePartsMall/financialManagement/collectionSettlement/detailsPage.vue

@@ -481,11 +481,11 @@ export default {
       let sum2=0
       list.forEach((item, index) => {
         item.contractNumber = item.ordNo;
-        item.accountsAmount = item.totalMoney
+        item.accountsAmount = item.bsType == "XS"?item.totalMoney:item.returnsAmount
         item.settlmentAmount = item.paymentAmountTl
         item.businesType=item.bsType
         this.$set(item,'thisAmount',item.bsType=="XS"?(Number(item.totalMoney) - Number(item.paymentAmountTl)):0)
-        this.$set(item,'thisRefundAmount',item.bsType=="TKXS"?(Number(item.totalMoney) - Number(item.paymentAmountTl)):0)
+        this.$set(item,'thisRefundAmount',item.bsType=="TKXS"?(Number(item.returnsAmount) - Number(item.paymentAmountTl)):0)
         // item.thisAmount =item.bsType=="XS"?(Number(item.totalMoney) - Number(item.paymentAmountTl)):0
         // item.thisRefundAmount =item.bsType=="TKXS"? (Number(item.totalMoney) - Number(item.paymentAmountTl)):0
         item.srcParentId = item.id

src/views/tirePartsMall/financialManagement/paymentSettlement/detailsPage.vue

@@ -470,11 +470,11 @@ export default {
       let sum2 = 0
       list.forEach((item, index) => {
         item.contractNumber = item.ordNo;
-        item.accountsAmount = item.totalMoney
+        item.accountsAmount = item.bsType == "CG"?item.totalMoney:item.returnsAmount
         item.settlmentAmount = item.paymentAmountTl
         item.businesType = item.bsType
         this.$set(item, 'thisAmount', item.bsType == "CG" ? (Number(item.totalMoney) - Number(item.paymentAmountTl)) : 0)
-        this.$set(item, 'thisRefundAmount', item.bsType == "TKCG" ? (Number(item.totalMoney) - Number(item.paymentAmountTl)) : 0)
+        this.$set(item, 'thisRefundAmount', item.bsType == "TKCG" ? (Number(item.returnsAmount) - Number(item.paymentAmountTl)) : 0)
         item.srcParentId = item.id
         item.srcBillNo = item.ordNo
         item.salesCompanyId = item.salesCompanyId

src/views/tirePartsMall/financialManagement/purchaseDetail/index.vue

@@ -204,7 +204,7 @@ export default {
                     prop: 'storageName',
                     overHidden: true,
                 }, {
-                    label: '采购单号',
+                    label: '业务编号',
                     prop: 'ordNo',
                     overHidden: true,
                     search: true,

src/views/tirePartsMall/financialManagement/saleDetail/index.vue

@@ -199,7 +199,7 @@ export default {
                     prop: 'storageName',
                     overHidden: true,
                 }, {
-                    label: '销售单号',
+                    label: '业务编号',
                     prop: 'ordNo',
                     overHidden: true,
                     search: true,

src/views/tirePartsMall/purchaseService/Task/index.vue

@@ -217,13 +217,7 @@ export default {
         //   overHidden: true,
         // },
         {
-          label: '采购数量',
-          prop: "goodsTotalNum",
-          width: 100,
-          overHidden: true,
-        },
-        {
-          label: '收货数量',
+          label: '退货数量',
           prop: "sendTotalNum",
           width: 100,
           overHidden: true,

src/views/tirePartsMall/purchaseService/outStorage/detailsPage.vue

@@ -117,7 +117,7 @@ export default {
             label: 'cname',
             value: 'id'
           },
-          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=KH&enableOrNot=1',
+          dicUrl: '/api/blade-sales-part/corpsDesc/listAll?corpType=KH,GYS&enableOrNot=1',
           rules: [{
             required: true,
             message: " ",

src/views/tirePartsMall/purchaseService/outStorage/index.vue

@@ -270,7 +270,7 @@ export default {
           // }
           , {
           label: "退货数量",
-          prop: "goodsTotalNum",
+          prop: "sendTotalNum",
           search: false,
           overHidden: true,
           // width: 120,

src/views/tirePartsMall/purchaseService/returns/detailsPage.vue

@@ -373,11 +373,16 @@ export default {
                     }
                 },
                 {
+                    label: '源单号',
+                    disabled: true,
+                    prop: "srcNo",
+                },
+                {
                     label: '备注',
                     prop: "remarks",
                     type: 'textarea',
                     disabled: false,
-                    span: 16,
+                    span: 8,
                     minRows: 1
                 }]
             },

src/views/tirePartsMall/purchaseService/returns/index.vue

@@ -186,6 +186,11 @@ export default {
             overHidden: true,
           },
           {
+            label: '状态',
+            prop: "status",
+            overHidden: true,
+          },
+          {
             label: '业务日期',
             prop: "businesDate",
             searchProp: "businesDateList",
@@ -332,7 +337,7 @@ export default {
       console.log(config, 427)
       config.params.bsType = 'TKCG'
       const routeData = this.$router.resolve({
-        path: '/api/blade-sales-part/order/listExport',      //跳转目标下载地址
+        path: '/api/blade-sales-part/returns/listExport',      //跳转目标下载地址
         query: {
           ...config.params    //括号内是要传递给新窗口的参数
         }

src/views/tirePartsMall/salesManagement/purchaseOrder/detailsPage.vue

@@ -18,8 +18,9 @@
                     {{ buttonText }}
                 </el-button>
                 <el-button class="el-button--small-yh" style="margin-left: 6px;" type="info" size="small"
-                    :disabled="form.status != '已收货'||form.returnsNumber==form.goodsTotalNum||editButton" @click="getReturns">
-                    生成采购退货
+                    :disabled="form.status != '已收货' || form.returnsNumber == form.goodsTotalNum || editButton"
+                    @click="getReturns">
+                    采购退货
                 </el-button>
                 <el-dropdown style="padding: 0 6px;line-height: 0">
                     <el-button v-show="!(!form.id || viewDisabled)" type="danger" :loading="buttonLoading"
@@ -96,7 +97,8 @@
                                 </el-button>
                                 <el-button type="primary" icon="el-icon-printer" size="small"
                                     @click="handlePrint">打印</el-button>
-                                <el-button type="danger" plain size="small" @click="batchDelete" :disabled="form.status != '录入' || editButton">一键删除</el-button>
+                                <el-button type="danger" plain size="small" @click="batchDelete"
+                                    :disabled="form.status != '录入' || editButton">一键删除</el-button>
                             </template>
                             <template slot="goodsId" slot-scope="{ row }">
                                 <!--<el-select v-if="row.$cellEdit" v-model="row.goodsId" allow-create filterable default-first-option >-->
@@ -1204,13 +1206,19 @@ export default {
     methods: {
         //生成退货单
         getReturns() {
-            this.$router.push({
-                path: "/tirePartsMall/purchaseService/returns/index",
-                query: {
-                    bsType: 'TKCG',
-                    id: this.form.id,
-                }
-            });
+            this.$confirm("您确定要退货吗?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                this.$router.push({
+                    path: "/tirePartsMall/purchaseService/returns/index",
+                    query: {
+                        bsType: 'TKCG',
+                        id: this.form.id,
+                    }
+                });
+            })
         },
         // 一键入库
         oneClickStorage() {
@@ -2238,6 +2246,7 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>::v-deep .el-form-item {
+<style lang="scss" scoped>
+::v-deep .el-form-item {
     margin-bottom: 8px !important;
 }</style>

src/views/tirePartsMall/salesManagement/purchaseOrder/index.vue

@@ -10,6 +10,27 @@
           <avue-crud :data="row.itemData" :option="itemOption" :table-loading="row.itemLoading" :cell-style="cellStyle"
             class="itemTable"></avue-crud>
         </template>
+        <template slot-scope="{ row }" slot="status">
+          <span v-for="(item, index) in orderStatusList" :key="index">
+            <span v-if="item.dictKey == row.status" :style="{ background: item.colour }" class="bottomBox">
+              {{ item.dictValue }}
+            </span>
+          </span>
+        </template>
+        <template slot-scope="{ row }" slot="actualPaymentStatus">
+          <span v-for="(item, index) in actualStatusList" :key="index">
+            <span v-if="item.dictKey == row.actualPaymentStatus" :style="{ background: item.colour }" class="bottomBox">
+              {{ item.dictValue }}
+            </span>
+          </span>
+        </template>
+        <template slot-scope="{ row }" slot="returnsStatus">
+          <span v-for="(item, index) in returnStatusList" :key="index">
+            <span v-if="item.dictKey == row.returnsStatus" :style="{ background: item.colour }" class="bottomBox">
+              {{ item.dictValue }}
+            </span>
+          </span>
+        </template>
         <template slot-scope="{type,size,row,index}" slot="menu">
           <!-- <el-button :size="size" :type="type" @click="check(row)">查看</el-button> -->
           <!--  判断是否一键采购过 然后展示不同的判断按钮-->
@@ -59,6 +80,9 @@ export default {
   },
   data() {
     return {
+      orderStatusList: [],
+      actualStatusList: [],
+      returnStatusList:[],
       detailsOpen: false,
       loading: false,
       search: {},
@@ -358,6 +382,11 @@ export default {
         //   overHidden: true,
         // },
         {
+          label: '退货状态',
+          prop: "returnsStatus",
+          overHidden: true,
+        },
+        {
           label: "制单人",
           prop: "createUserName",
           searchProp: "createUser",
@@ -468,6 +497,16 @@ export default {
       this.option.searchMenuSpan = num * 8;
       this.option.searchMenuPosition = "right";
     }
+    this.getWorkDicts("sales_Status").then(res => {
+      this.orderStatusList = res.data.data
+      console.log(this.orderStatusList);
+    });
+    this.getWorkDicts("settlement_Status").then(res => {
+      this.actualStatusList = res.data.data
+    });
+    this.getWorkDicts("return_Status").then(res => {
+      this.returnStatusList = res.data.data
+    });
   },
   methods: {
       // 导出
@@ -614,4 +653,11 @@ export default {
 }
 </script>
 
-<style scoped></style>
+<style scoped>
+.bottomBox {
+  padding: 3px 6px;
+  border-radius: 12px;
+  color: #fff;
+  font-size: 10px;
+}
+</style>

src/views/tirePartsMall/salesManagement/saleOrder/index.vue

@@ -7,15 +7,24 @@
         @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 269)"
         @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 269)" :page.sync="page">
         <template slot-scope="{ row }" slot="status">
-          <span v-for="item in orderStatusList" :style="{ background: item.colour }" class="bottomBox"
-            v-if="item.dictKey == row.status">
-            {{ item.dictValue }}
+          <span v-for="(item, index) in orderStatusList" :key="index">
+            <span v-if="item.dictKey == row.status" :style="{ background: item.colour }" class="bottomBox">
+              {{ item.dictValue }}
+            </span>
           </span>
         </template>
         <template slot-scope="{ row }" slot="actualPaymentStatus">
-          <span v-for="item in actualStatusList" :style="{ background: item.colour }" class="bottomBox"
-            v-if="item.dictKey == row.actualPaymentStatus">
-            {{ item.dictValue }}
+          <span v-for="(item, index) in actualStatusList" :key="index">
+            <span v-if="item.dictKey == row.actualPaymentStatus" :style="{ background: item.colour }" class="bottomBox">
+              {{ item.dictValue }}
+            </span>
+          </span>
+        </template>
+        <template slot-scope="{ row }" slot="returnsStatus">
+          <span v-for="(item, index) in returnStatusList" :key="index">
+            <span v-if="item.dictKey == row.returnsStatus" :style="{ background: item.colour }" class="bottomBox">
+              {{ item.dictValue }}
+            </span>
           </span>
         </template>
         <!--actualPaymentStatus-->
@@ -33,7 +42,7 @@
           <crop-select v-model="search.corpId" corpType="KH" :refresh="false"></crop-select>
         </template>
         <template slot="notCompleteSearch">
-          <el-checkbox v-model="search.notComplete" true-label="1" ></el-checkbox>
+          <el-checkbox v-model="search.notComplete" true-label="1"></el-checkbox>
         </template>
         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
           <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">新建订单</el-button>
@@ -70,6 +79,7 @@ export default {
       detailsOpen: false,
       orderStatusList: [],
       actualStatusList: [],
+      returnStatusList: [],
       loading: false,
       search: {},
       form: {},
@@ -336,6 +346,11 @@ export default {
           //   value: "dictKey"
           // }
 
+        },
+        {
+          label: '退货状态',
+          prop: "returnsStatus",
+          overHidden: true,
         }, {
           label: '应结日期',
           prop: "dueDate",
@@ -473,6 +488,9 @@ export default {
     this.getWorkDicts("settlement_Status").then(res => {
       this.actualStatusList = res.data.data
     });
+    this.getWorkDicts("return_Status").then(res => {
+      this.returnStatusList = res.data.data
+    });
   },
   methods: {
     // 导出

src/views/tirePartsMall/salesService/Task/index.vue

@@ -203,13 +203,7 @@ export default {
         //   overHidden: true,
         // },
         {
-          label: '销售数量',
-          prop: "goodsTotalNum",
-          width: 100,
-          overHidden: true,
-        },
-        {
-          label: '发货数量',
+          label: '退货数量',
           prop: "sendTotalNum",
           width: 100,
           overHidden: true,

src/views/tirePartsMall/salesService/inStorage/detailsPage.vue

@@ -203,9 +203,9 @@ export default {
                         ],
                         change: ({ value, column }) => {
                             if (this.form.billno.indexOf('TK') != -1) {
-                                this.corpsDescListAllfun('KH')
+                                this.corpsDescListAllfun('KH,GYS')
                             } else {
-                                this.corpsDescListAllfun('GYS')
+                                this.corpsDescListAllfun('KH,GYS')
                             }
                         }
                     },

src/views/tirePartsMall/salesService/inStorage/index.vue

@@ -148,8 +148,8 @@ export default {
             disabled: false,
             overHidden: true
           }, {
-            label: "入库数量",
-            prop: "goodsNum",
+            label: "退货数量",
+            prop: "sendTotalNum",
             disabled: true,
             ovrHidden: true,
           }, {

src/views/tirePartsMall/salesService/returns/detailsPage.vue

@@ -373,6 +373,16 @@ export default {
                     }
                 },
                 {
+                    label: '源单号',
+                    disabled: true,
+                    prop: "srcNo",
+                },
+                {
+                    label: '运费',
+                    disabled: true,
+                    prop: "freight",
+                },
+                {
                     label: '备注',
                     prop: "remarks",
                     type: 'textarea',

src/views/tirePartsMall/salesService/returns/index.vue

@@ -180,6 +180,11 @@ export default {
             overHidden: true,
           },
           {
+            label: '状态',
+            prop: "status",
+            overHidden: true,
+          },
+          {
             label: '业务日期',
             prop: "businesDate",
             searchProp: "businesDateList",
@@ -326,7 +331,7 @@ export default {
       console.log(config, 427)
       config.params.bsType = 'TKXS'
       const routeData = this.$router.resolve({
-        path: '/api/blade-sales-part/order/listExport',      //跳转目标下载地址
+        path: '/api/blade-sales-part/returns/listExport',      //跳转目标下载地址
         query: {
           ...config.params    //括号内是要传递给新窗口的参数
         }