修改bug

package-lock.json

@@ -2990,6 +2990,16 @@
       "dev": true,
       "optional": true
     },
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmmirror.com/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
     "bl": {
       "version": "1.2.3",
       "resolved": "https://registry.npmmirror.com/bl/-/bl-1.2.3.tgz",
@@ -6813,6 +6823,13 @@
       "integrity": "sha512-UssQP5ZgIOKelfsaB5CuGAL+Y+q7EmONuiwF3N5HAH0t27rvrttgi6Ra9k/+DVaY9UF6+ybxu5pOXLUdA8N7Vg==",
       "dev": true
     },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
     "filename-reserved-regex": {
       "version": "2.0.0",
       "resolved": "https://registry.npmmirror.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz",
@@ -15151,6 +15168,7 @@
           "dev": true,
           "optional": true,
           "requires": {
+            "bindings": "^1.5.0",
             "nan": "^2.12.1"
           }
         },
@@ -15458,6 +15476,7 @@
           "dev": true,
           "optional": true,
           "requires": {
+            "bindings": "^1.5.0",
             "nan": "^2.12.1"
           }
         },

src/views/tirePartsMall/basicData/shareListing/index.vue

@@ -14,11 +14,11 @@
             @refresh-change="refreshChange" @row-del="rowDel"
             @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 431)"
             @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 431)" :page.sync="page">
-            <template slot="filesListForm">
+            <!-- <template slot="filesListForm">
               <span style="font-size: 12px;">(图片文件像素推荐700X700，有且只允许有一张主图，其余均为副图)</span>
               <c-upload :data="form.filesList" display basic deleteUrl="/api/blade-sales-part/productLaunchFiles/remove"
                 :enumerationValue="160" />
-            </template>
+            </template> -->
 
             <template slot="detailsTextForm">
               <avue-ueditor v-model="form.detailsText" :options="optionsUeditor">
@@ -386,14 +386,15 @@ export default {
           },
           dicUrl: '/api/blade-system/dept/deptListAll',
         },
+        // {
+        //   label: "商品图片",
+        //   prop: "filesList",
+        //   hide: true,
+        //   showColumn: false,
+        //   overHidden: true,
+        //   span: 24,
+        // }, 
         {
-          label: "商品图片",
-          prop: "filesList",
-          hide: true,
-          showColumn: false,
-          overHidden: true,
-          span: 24,
-        }, {
           label: "防爆",
           prop: "explosionProof",
           display: false,
@@ -552,17 +553,12 @@ export default {
     },
     // 商城图片上传
     onSuccess(response, file, fileList) {
-      let version = '2'
-      if (this.form.filesList.length == 0) {
-        version = '0'
-      }
+      // let version = '2'
+      // if (this.form.filesList.length == 0) {
+      //   version = '0'
+      // }
 
-      this.form.filesList.push({
-        fileName: response.data.originalName,
-        url: response.data.link,
-        sort: this.form.filesList.length,
-        version: version
-      })
+      this.form.url=response.data.link
       submit({
         ...this.form
       }).then(res => {
@@ -587,10 +583,10 @@ export default {
     annexOpen(row, index) {
       this.dataId = index
       this.rowImg = row
-      this.orderList = row.filesList ? row.filesList : [];
-      for (let order of this.orderList) {
-        order.paymentType = order.typeFiles
-      }
+      // this.orderList = row.filesList ? row.filesList : [];
+      // for (let order of this.orderList) {
+      //   order.paymentType = order.typeFiles
+      // }
       getDetail({ id: row.id }).then(res => {
         this.form = res.data.data
       })
@@ -598,24 +594,24 @@ export default {
     },
     // 附件保存
     saveAnnex() {
-      if (this.orderList.length > 0) {
-        // 循环把编辑状态变成保存状态
-        this.orderList.map((item) => {
-          if (item.$cellEdit == true) {
-            item.$cellEdit = false
-          } else {
-            item.$cellEdit = true
-          }
-        })
-        let flag = this.orderList.some(item => {
-          return item.$version == '主图'
-        })
-        if (!flag) {
-          this.$message.warning('请选择主图')
-          return
-        }
-      }
-      this.rowImg.filesList = this.orderList;
+      // if (this.orderList.length > 0) {
+      //   // 循环把编辑状态变成保存状态
+      //   this.orderList.map((item) => {
+      //     if (item.$cellEdit == true) {
+      //       item.$cellEdit = false
+      //     } else {
+      //       item.$cellEdit = true
+      //     }
+      //   })
+      //   let flag = this.orderList.some(item => {
+      //     return item.$version == '主图'
+      //   })
+      //   if (!flag) {
+      //     this.$message.warning('请选择主图')
+      //     return
+      //   }
+      // }
+      // this.rowImg.filesList = this.orderList;
       submit({
         ...this.rowImg
       }).then(res => {
@@ -733,28 +729,28 @@ export default {
     },
     //编辑确定
     rowUpdate(form, index, done, loading) {
-      if (this.form.filesList.length > 0) {
-        let flag = this.form.filesList.some(item => {
-          return item.$version == '主图'
-        })
-        if (!flag) {
-          this.$message.warning('请选择主图')
-          // done()
-          loading()
-          return
-        }
-        // 循环把编辑状态变成保存状态
-        this.form.filesList.map((item) => {
-          if (item.$cellEdit == true) {
-            // this.$set(item, "$cellEdit", false);
-            item.$cellEdit = false
-          } else {
-            // this.$set(item, "$cellEdit", true);
-            item.$cellEdit = true
-          }
-        })
-      }
-      console.log({ ...this.form }.detailsText, 651)
+      // if (this.form.filesList.length > 0) {
+      //   let flag = this.form.filesList.some(item => {
+      //     return item.$version == '主图'
+      //   })
+      //   if (!flag) {
+      //     this.$message.warning('请选择主图')
+      //     // done()
+      //     loading()
+      //     return
+      //   }
+      //   // 循环把编辑状态变成保存状态
+      //   this.form.filesList.map((item) => {
+      //     if (item.$cellEdit == true) {
+      //       // this.$set(item, "$cellEdit", false);
+      //       item.$cellEdit = false
+      //     } else {
+      //       // this.$set(item, "$cellEdit", true);
+      //       item.$cellEdit = true
+      //     }
+      //   })
+      // }
+      // console.log({ ...this.form }.detailsText, 651)
       submit({
         ...this.form
       }).then(res => {

src/views/tirePartsMall/basicData/sharedSales/detailsPage.vue

@@ -18,14 +18,14 @@
                     @click="getReturns">
                     销售退货
                 </el-button>
-                <el-button v-if="form.status != '已发货'" class="el-button--small-yh" style="margin-left: 6px;"
+                <!-- <el-button v-if="form.status != '已发货'" class="el-button--small-yh" style="margin-left: 6px;"
                     type="success" size="small" :disabled="!form.id || editButton || form.businessSource == '外部销售'"
                     @click="confirm(1)">确认到货
                 </el-button>
                 <el-button v-if="form.status == '已发货'" class="el-button--small-yh" style="margin-left: 6px;"
                     type="danger" size="small" :disabled="!form.id || editButton || form.businessSource == '外部销售'"
                     @click="confirm(2)">撤销到货
-                </el-button>
+                </el-button> -->
             </div>
         </div>
         <div style="margin-top: 50px">
@@ -76,7 +76,7 @@
                                     :disabled="selectionMultilist.length == 0 || editButton || form.status == '已发货'"
                                     @click="allClick('派发销售单')">派发销售单</el-button>
                                 <el-button type="danger" plain size="small" @click="allClick('撤销派发')"
-                                    :disabled="selectionMultilist.length == 0 || editButton || form.status != '已发货'">撤销派发</el-button>
+                                    :disabled="selectionMultilist.length == 0 || editButton || form.goodsTotalShipNum == 0">撤销派发</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"
@@ -165,7 +165,7 @@
                     </el-tab-pane>
                 </el-tabs>
             </trade-card>
-            <report-dialog :switchDialog="switchDialog" reportName="轮胎商城-销售订单" :reportId="form.id"
+            <report-dialog :switchDialog="switchDialog" reportName="轮胎商城-共享销售" :reportId="form.id"
                 @onClose="onClose()"></report-dialog>
         </div>
 
@@ -365,7 +365,7 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: '发货数量',
+                        label: '已派发数量',
                         prop: 'sendNum',
                         overHidden: true,
                     },
@@ -950,7 +950,7 @@ export default {
                     width: 100
                 },
                 {
-                    label: '发货数量',
+                    label: '已派发数量',
                     prop: 'sendNum',
                     overHidden: true,
                     width: 100,

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

@@ -830,7 +830,7 @@ export default {
                         });
                         checkOrder({ ...data }).then((res) => {
                             this.getDetail(res.data.data.id)
-                            this.$message.success('申请退款成功');
+                            this.$message.success('申请退货成功');
                             this.isApplySettlement = !this.isApplySettlement
                             loading.close();
                             console.log(res);

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

@@ -365,373 +365,373 @@ export default {
         }]
       },
       optionContactsBack2: {
-                disabled: false,
-                border: true,
-                align: 'center',
-                index: true,
-                addBtnText: "添加商品",
-                updateBtnText: '保存',
-                refreshBtn: false,
-                dialogDrag: true,
-                addBtn: false,
-                span: 8,
-                height: 500,
-                // 添加
-                addRowBtn: false,
-                // 保存按钮
-                editBtn: false,
-                // 航编辑开启
-                cellBtn: true,
-                rowKey: 'ids',
-                delBtn: false,
-                menuWidth: 140,
-                dialogTop: 25,
-                dialogWidth: "80%",
-                summaryText: "合计",
-                showSummary: true,
-                selection: true,
-                sumColumnList: [{
-                    name: "goodsNum",
-                    type: "sum"
-                }, {
-                    name: "price",
-                    type: "sum",
-                    decimals: 2
-                }, {
-                    name: "sendNum",
-                    type: "sum",
-                    decimals: 2
-                }, {
-                    name: "outGoodsTotalShipNum",
-                    type: "sum",
-                    decimals: 2
-                }, {
-                    name: "outGoodsTotalShipAmount",
-                    type: "sum",
-                    decimals: 2
-                }, {
-                    name: "subTotalMoney",
-                    type: "sum",
-                    decimals: 2
-                }, {
-                    name: "returnsNumber",
-                    type: "sum"
-                }, {
-                    name: "returnsAmount",
-                    type: "sum"
-                }, {
-                    name: "primaryGoodsTotalNum",
-                    type: "sum"
-                }, {
-                    name: "inventory",
-                    type: "sum"
-                }, {
-                    name: "rebatePrice",
-                    type: "sum",
-                    decimals: 2
-                }, {
-                    name: "rebateCostprie",
-                    type: "sum",
-                    decimals: 2
-                }, {
-                    name: "rebateProfit",
-                    type: "sum",
-                    decimals: 2
-                }, {
-                    name: "primaryGoodsTotalAmount",
-                    type: "sum",
-                    decimals: 2
-                }],
-                column: [
-                    {
-                        label: '商品名称',
-                        prop: 'goodsId',
-                        width: 200,
-                        disabled: false,
-                        remote: true,
-                        hide: true,
-                        overHidden: true,
-                        type: 'select',
-                        // dicData: [],
-                        props: {
-                            label: 'cname',
-                            value: 'id'
-                        },
-                        // dicUrl: '/api/blade-sales-part/goodsDesc/goodsListAll?cname={{key}}'
-                        dicUrl: "/api/blade-sales-part/goodsDesc/list?current=1&size=10&cname={{key}}&enableOrNot=1"
-                        // dicUrl: "/api/blade-sales-part/goodsDesc/goodsListXs?cname={{key}}"
-                    },
-                    {
-                        label: '商品名称',
-                        prop: 'goodsName',
-                        width: 200,
-                        disabled: false,
-                        remote: true,
-                        overHidden: true,
-                    }, {
-                        label: '数量',
-                        prop: 'goodsNum',
-                        overHidden: true,
-                        disabled: false,
-                        cell: true,
-                        width: 100,
-                        rules: [{
-                            required: true,
-                            message: " ",
-                            trigger: "blur"
-                        }, {
-                            validator: (rule, value, callback) => {
-                                console.log(this.formContacts.inventory);
-                                if (value < 0) {
-                                    callback(new Error("数量不能小于0"));
-                                } else {
-                                    callback();
-                                }
-                            },
-                            trigger: "blur"
-                        }]
-                    },
-                    {
-                        label: '价格',
-                        prop: 'price',
-                        overHidden: true,
-                        width: 100,
-                        disabled: false,
-                        cell: true,
-                        rules: [{
-                            required: true,
-                            message: " ",
-                            trigger: "blur"
-                        }, {
-                            validator: (rule, value, callback) => {
-                                if (value < 0) {
-                                    callback(new Error("价格不能小于0"));
-                                } else {
-                                    callback();
-                                }
-                            },
-                            trigger: "blur"
-                        }]
-                    },
-                    {
-                        label: '库存',
-                        prop: 'inventory',
-                        overHidden: true,
-                        width: 100
-                    }, {
-                        label: '批次号',
-                        prop: 'dot',
-                        cell: true,
-                        width: 120,
-                        type: "select",
-                        disabled: true,
-                        allowCreate: true,
-                        filterable: true,
-                        dicData: [],
-                        props: {
-                            label: "dot",
-                            value: "dot"
-                        },
-                        dicUrl: "/api/blade-sales-part/stockDesc/dotList",
-                        overHidden: true,
-                    }, {
-                        label: '小计',
-                        prop: 'subTotalMoney',
-                        overHidden: true,
-                        width: 100,
-                        disabled: true,
-                        editDisplay: false,
-                        addDisplay: false
-                    }, {
-                        label: '商品编码',
-                        prop: 'goodsNo',
-                        overHidden: true,
-                        disabled: false,
-                        width: 100
-                    },
-                    {
-                        label: '品牌',
-                        prop: 'brandName',
-                        disabled: false,
-                        width: 100,
-                        overHidden: true,
-                    },
-                    {
-                        label: '规格型号',
-                        prop: 'propertyName',
-                        overHidden: true,
-                        disabled: false,
-                        width: 100
-                    }, {
-                        label: '花纹',
-                        prop: 'pattern',
-                        overHidden: true,
-                        disabled: false,
-                        width: 100
-                    }, {
-                        label: '商品描述',
-                        prop: 'goodsDescription',
-                        disabled: false,
-                        overHidden: true,
-                        width: 100
-                    },
-                    {
-                        label: '单位',
-                        prop: 'units',
-                        type: "select",
-                        disabled: false,
-                        props: {
-                            label: "dictValue",
-                            value: "dictValue"
-                        },
-                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=unit",
-                        overHidden: true,
-                        width: 100
-                    },
-                    {
-                        label: '订单数量',
-                        prop: 'primaryGoodsTotalNum',
-                        overHidden: true,
-                        width: 100,
-                        disabled: true,
-                        editDisplay: false,
-                        addDisplay: false
-                    },
-                    {
-                        label: '订单金额',
-                        prop: "primaryGoodsTotalAmount",
-                        overHidden: true,
-                        width: 100,
-                        disabled: true,
-                        editDisplay: false,
-                        addDisplay: false
-                    },
-                    {
-                        label: '入库数量',
-                        prop: 'sendNum',
-                        overHidden: true,
-                        width: 100,
-                        disabled: true,
-                        editDisplay: false,
-                        addDisplay: false
-                    },
-                    {
-                        label: '出库数量',
-                        prop: 'outGoodsTotalShipNum',
-                        overHidden: true,
-                        width: 100,
-                        disabled: true,
-                        editDisplay: false,
-                        addDisplay: false
-                    },
-                    {
-                        label: '出库金额',
-                        prop: 'outGoodsTotalShipAmount',
-                        overHidden: true,
-                        width: 100,
-                        disabled: true,
-                        editDisplay: false,
-                        addDisplay: false
-                    },
-                    {
-                        label: '原始数量',
-                        prop: 'primaryGoodsTotalNum',
-                        overHidden: true,
-                        width: 100,
-                        disabled: true,
-                        editDisplay: false,
-                        addDisplay: false
-                    },
-                    {
-                        label: '原始金额',
-                        prop: 'primaryGoodsTotalAmount',
-                        overHidden: true,
-                        width: 100,
-                        disabled: true,
-                        editDisplay: false,
-                        addDisplay: false
-                    },
-                    {
-                        label: '返利后单价',
-                        prop: 'rebatePrice',
-                        overHidden: true,
-                        width: 100,
-                        cell: true,
-                    },
-                    {
-                        label: '返利后成本价',
-                        prop: 'rebateCostprie',
-                        overHidden: true,
-                        width: 100,
-                        disabled: true,
-                        editDisplay: false,
-                        addDisplay: false
-                    },
-                    {
-                        label: '返利后利润',
-                        prop: 'rebateProfit',
-                        overHidden: true,
-                        width: 100,
-                        disabled: true,
-                        editDisplay: false,
-                        addDisplay: false
-                    },
-                    // {
-                    //     label: '退货数量',
-                    //     prop: "returnsNumber",
-                    //     overHidden: true,
-                    //     width: 100,
-                    //     disabled: true,
-                    // },
-                    // {
-                    //     label: '退货金额',
-                    //     prop: "returnsAmount",
-                    //     overHidden: true,
-                    //     width: 100,
-                    //     disabled: true,
-                    // },
-                    // {
-                    //     label: '利润',
-                    //     prop: 'profit',
-                    //     overHidden: true,
-                    //     width: 100
-                    // },
+        disabled: false,
+        border: true,
+        align: 'center',
+        index: true,
+        addBtnText: "添加商品",
+        updateBtnText: '保存',
+        refreshBtn: false,
+        dialogDrag: true,
+        addBtn: false,
+        span: 8,
+        height: 500,
+        // 添加
+        addRowBtn: false,
+        // 保存按钮
+        editBtn: false,
+        // 航编辑开启
+        cellBtn: true,
+        rowKey: 'ids',
+        delBtn: false,
+        menuWidth: 140,
+        dialogTop: 25,
+        dialogWidth: "80%",
+        summaryText: "合计",
+        showSummary: true,
+        selection: true,
+        sumColumnList: [{
+          name: "goodsNum",
+          type: "sum"
+        }, {
+          name: "price",
+          type: "sum",
+          decimals: 2
+        }, {
+          name: "sendNum",
+          type: "sum",
+          decimals: 2
+        }, {
+          name: "outGoodsTotalShipNum",
+          type: "sum",
+          decimals: 2
+        }, {
+          name: "outGoodsTotalShipAmount",
+          type: "sum",
+          decimals: 2
+        }, {
+          name: "subTotalMoney",
+          type: "sum",
+          decimals: 2
+        }, {
+          name: "returnsNumber",
+          type: "sum"
+        }, {
+          name: "returnsAmount",
+          type: "sum"
+        }, {
+          name: "primaryGoodsTotalNum",
+          type: "sum"
+        }, {
+          name: "inventory",
+          type: "sum"
+        }, {
+          name: "rebatePrice",
+          type: "sum",
+          decimals: 2
+        }, {
+          name: "rebateCostprie",
+          type: "sum",
+          decimals: 2
+        }, {
+          name: "rebateProfit",
+          type: "sum",
+          decimals: 2
+        }, {
+          name: "primaryGoodsTotalAmount",
+          type: "sum",
+          decimals: 2
+        }],
+        column: [
+          {
+            label: '商品名称',
+            prop: 'goodsId',
+            width: 200,
+            disabled: false,
+            remote: true,
+            hide: true,
+            overHidden: true,
+            type: 'select',
+            // dicData: [],
+            props: {
+              label: 'cname',
+              value: 'id'
+            },
+            // dicUrl: '/api/blade-sales-part/goodsDesc/goodsListAll?cname={{key}}'
+            dicUrl: "/api/blade-sales-part/goodsDesc/list?current=1&size=10&cname={{key}}&enableOrNot=1"
+            // dicUrl: "/api/blade-sales-part/goodsDesc/goodsListXs?cname={{key}}"
+          },
+          {
+            label: '商品名称',
+            prop: 'goodsName',
+            width: 200,
+            disabled: false,
+            remote: true,
+            overHidden: true,
+          }, {
+            label: '数量',
+            prop: 'goodsNum',
+            overHidden: true,
+            disabled: false,
+            cell: true,
+            width: 100,
+            rules: [{
+              required: true,
+              message: " ",
+              trigger: "blur"
+            }, {
+              validator: (rule, value, callback) => {
+                console.log(this.formContacts.inventory);
+                if (value < 0) {
+                  callback(new Error("数量不能小于0"));
+                } else {
+                  callback();
+                }
+              },
+              trigger: "blur"
+            }]
+          },
+          {
+            label: '价格',
+            prop: 'price',
+            overHidden: true,
+            width: 100,
+            disabled: false,
+            cell: true,
+            rules: [{
+              required: true,
+              message: " ",
+              trigger: "blur"
+            }, {
+              validator: (rule, value, callback) => {
+                if (value < 0) {
+                  callback(new Error("价格不能小于0"));
+                } else {
+                  callback();
+                }
+              },
+              trigger: "blur"
+            }]
+          },
+          {
+            label: '库存',
+            prop: 'inventory',
+            overHidden: true,
+            width: 100
+          }, {
+            label: '批次号',
+            prop: 'dot',
+            cell: true,
+            width: 120,
+            type: "select",
+            disabled: true,
+            allowCreate: true,
+            filterable: true,
+            dicData: [],
+            props: {
+              label: "dot",
+              value: "dot"
+            },
+            dicUrl: "/api/blade-sales-part/stockDesc/dotList",
+            overHidden: true,
+          }, {
+            label: '小计',
+            prop: 'subTotalMoney',
+            overHidden: true,
+            width: 100,
+            disabled: true,
+            editDisplay: false,
+            addDisplay: false
+          }, {
+            label: '商品编码',
+            prop: 'goodsNo',
+            overHidden: true,
+            disabled: false,
+            width: 100
+          },
+          {
+            label: '品牌',
+            prop: 'brandName',
+            disabled: false,
+            width: 100,
+            overHidden: true,
+          },
+          {
+            label: '规格型号',
+            prop: 'propertyName',
+            overHidden: true,
+            disabled: false,
+            width: 100
+          }, {
+            label: '花纹',
+            prop: 'pattern',
+            overHidden: true,
+            disabled: false,
+            width: 100
+          }, {
+            label: '商品描述',
+            prop: 'goodsDescription',
+            disabled: false,
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: '单位',
+            prop: 'units',
+            type: "select",
+            disabled: false,
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=unit",
+            overHidden: true,
+            width: 100
+          },
+          {
+            label: '订单数量',
+            prop: 'primaryGoodsTotalNum',
+            overHidden: true,
+            width: 100,
+            disabled: true,
+            editDisplay: false,
+            addDisplay: false
+          },
+          {
+            label: '订单金额',
+            prop: "primaryGoodsTotalAmount",
+            overHidden: true,
+            width: 100,
+            disabled: true,
+            editDisplay: false,
+            addDisplay: false
+          },
+          {
+            label: '入库数量',
+            prop: 'sendNum',
+            overHidden: true,
+            width: 100,
+            disabled: true,
+            editDisplay: false,
+            addDisplay: false
+          },
+          {
+            label: '出库数量',
+            prop: 'outGoodsTotalShipNum',
+            overHidden: true,
+            width: 100,
+            disabled: true,
+            editDisplay: false,
+            addDisplay: false
+          },
+          {
+            label: '出库金额',
+            prop: 'outGoodsTotalShipAmount',
+            overHidden: true,
+            width: 100,
+            disabled: true,
+            editDisplay: false,
+            addDisplay: false
+          },
+          {
+            label: '原始数量',
+            prop: 'primaryGoodsTotalNum',
+            overHidden: true,
+            width: 100,
+            disabled: true,
+            editDisplay: false,
+            addDisplay: false
+          },
+          {
+            label: '原始金额',
+            prop: 'primaryGoodsTotalAmount',
+            overHidden: true,
+            width: 100,
+            disabled: true,
+            editDisplay: false,
+            addDisplay: false
+          },
+          {
+            label: '返利后单价',
+            prop: 'rebatePrice',
+            overHidden: true,
+            width: 100,
+            cell: true,
+          },
+          {
+            label: '返利后成本价',
+            prop: 'rebateCostprie',
+            overHidden: true,
+            width: 100,
+            disabled: true,
+            editDisplay: false,
+            addDisplay: false
+          },
+          {
+            label: '返利后利润',
+            prop: 'rebateProfit',
+            overHidden: true,
+            width: 100,
+            disabled: true,
+            editDisplay: false,
+            addDisplay: false
+          },
+          // {
+          //     label: '退货数量',
+          //     prop: "returnsNumber",
+          //     overHidden: true,
+          //     width: 100,
+          //     disabled: true,
+          // },
+          // {
+          //     label: '退货金额',
+          //     prop: "returnsAmount",
+          //     overHidden: true,
+          //     width: 100,
+          //     disabled: true,
+          // },
+          // {
+          //     label: '利润',
+          //     prop: 'profit',
+          //     overHidden: true,
+          //     width: 100
+          // },
 
-                    // {
-                    //     label: '返利',
-                    //     prop: 'thisAmount',
-                    //     overHidden: true,
-                    //     width: 100
-                    // },
-                    // {
-                    //     label: '成本',
-                    //     prop: 'costprie',
-                    //     overHidden: true,
-                    //     width: 100,
-                    //     disabled: true,
-                    //     editDisplay: false,
-                    //     addDisplay: false
+          // {
+          //     label: '返利',
+          //     prop: 'thisAmount',
+          //     overHidden: true,
+          //     width: 100
+          // },
+          // {
+          //     label: '成本',
+          //     prop: 'costprie',
+          //     overHidden: true,
+          //     width: 100,
+          //     disabled: true,
+          //     editDisplay: false,
+          //     addDisplay: false
 
-                    // },
-                    // {
-                    //     label: '毛利',
-                    //     prop: 'grossProfit',
-                    //     overHidden: true,
-                    //     width: 100,
-                    //     disabled: true,
-                    //     editDisplay: false,
-                    //     addDisplay: false
-                    // },
-                    {
-                        label: '备注',
-                        prop: "remarks",
-                        overHidden: true,
-                        width: 100,
-                        disabled: false,
+          // },
+          // {
+          //     label: '毛利',
+          //     prop: 'grossProfit',
+          //     overHidden: true,
+          //     width: 100,
+          //     disabled: true,
+          //     editDisplay: false,
+          //     addDisplay: false
+          // },
+          {
+            label: '备注',
+            prop: "remarks",
+            overHidden: true,
+            width: 100,
+            disabled: false,
 
-                    }
-                ]
-            },
+          }
+        ]
+      },
     }
   },
   components: {
@@ -882,8 +882,8 @@ export default {
               loading.close();
             });
           }).catch(() => {
-              loading.close();
-            });
+            loading.close();
+          });
         } else {
           this.$message.error('请选择库管')
         }
@@ -1091,11 +1091,11 @@ export default {
     },
     calculator(row) {
       if (row.sendNumFinancing > row.inventoryFinancing) {
-        this.$set(row, 'sendNumFinancing',null)
+        this.$set(row, 'sendNumFinancing', null)
         this.$message.error("融资数量不能大于参考库存融资");
       }
       if (row.sendNumHave > row.inventoryHave) {
-        this.$set(row, 'sendNumHave',null)
+        this.$set(row, 'sendNumHave', null)
         this.$message.error("自由数量不能大于参考库存自有");
       }
       row.goodsNum = Number(Number(row.sendNumFinancing) + Number(row.sendNumHave))
@@ -1118,8 +1118,8 @@ export default {
           price: item.price, // 单价
           goodsName: item.cname,
           goodsNum: item.goodsNum,
-          sendNumFinancing: this.whetherFinancing == 1? item.sendNumFinancing : 0,
-          sendNumHave:this.whetherFinancing == 1? item.sendNumHave : 0,
+          sendNumFinancing: this.whetherFinancing == 1 ? item.sendNumFinancing : 0,
+          sendNumHave: this.whetherFinancing == 1 ? item.sendNumHave : 0,
           brandName: item.brandName,
           brandId: item.brandId,
           goodsNo: item.code,
@@ -1147,7 +1147,10 @@ export default {
         this.form.shipItemsList.push(obj)
       }
       this.$refs.dialogAssemblyRef.dialogVisible = false
-      // this.dialogVisible = false
+      this.$nextTick(() => {
+        this.$refs.formContacts.doLayout();
+        this.$refs.formContacts.refreshTable();
+      });
     },
 
     //自定义列保存

src/views/tirePartsMall/salesManagement/outboundWorkOrderL/dialogAssembly.vue

@@ -151,11 +151,13 @@ export default {
                 this.findObject(this.optionTwo.column, "sendNumHave").showColumn = true
             }
         })
+        this.onLoadfun(this.page);
     },
     methods: {
         closeGoods() {
             this.treeDataGoods = [];
             this.treeDeptId = "";
+            this.goodsListSave=[]
             this.activeNameTabs = "searchList";
         },
         //导入页左商品类型查询
@@ -214,6 +216,7 @@ export default {
                 })
                 const data = res.data.data;
                 this.page.total = data.total;
+                this.data= data.records;
                 this.goodsListShow = data.records;
                 this.loading = false;
             })

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

@@ -35,8 +35,7 @@
           <!-- <el-button :size="size" :type="type" @click="check(row)">查看</el-button> -->
           <!--  判断是否一键采购过 然后展示不同的判断按钮-->
           <el-button v-if="row.shortcutWarehousingStatus == '1'" :size="size" :type="type"
-                     :disabled="row.status != '录入' && row.item >= 1"
-                     @click="$refs.crud.rowDel(row, index)">删除</el-button>
+            :disabled="row.status != '录入' && row.item >= 1" @click="$refs.crud.rowDel(row, index)">删除</el-button>
 
           <el-button v-else :size="size" :type="type"
             :disabled="row.status != '录入' && row.status != '待确认' && row.item >= 1 || row.numberRows >= 1"
@@ -46,7 +45,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>
@@ -71,7 +70,7 @@
 import { getList, remove, getGoodsInfo } from "@/api/tirePartsMall/salesManagement/saleOrder";
 import detailsPage from "./detailsPage"
 import { getDetails } from "@/api/tirePartsMall/salesManagement/saleOrder";
-import {getToken} from "@/util/auth";
+import { getToken } from "@/util/auth";
 
 export default {
   name: "index",
@@ -82,7 +81,7 @@ export default {
     return {
       orderStatusList: [],
       actualStatusList: [],
-      returnStatusList:[],
+      returnStatusList: [],
       detailsOpen: false,
       loading: false,
       search: {},
@@ -303,8 +302,8 @@ export default {
           // type: 'select',
           search: true,
           overHidden: true,
-          cell:true,
-          width:140,
+          cell: true,
+          width: 140,
           // filterable:true,
           // remote:true,
           // props: {
@@ -355,18 +354,18 @@ export default {
           label: '数量',
           prop: "goodsTotalNum",
           overHidden: true,
-        }, 
+        },
         // {
         //   label: '金额',
         //   prop: "totalMoney",
         //   overHidden: true,
         // }, 
         {
-                label: '已付金额',
-                prop: "paymentAmountTl",
-                disabled: true
-            }, 
-            {
+          label: '已付金额',
+          prop: "paymentAmountTl",
+          disabled: true
+        },
+        {
           label: '状态',
           prop: "status",
           search: true,
@@ -381,7 +380,7 @@ export default {
         {
           label: '结算状态',
           prop: "actualPaymentStatus",
-          searchProp:'actualPaymentType',
+          searchProp: 'actualPaymentType',
           search: true,
           overHidden: true,
           type: 'select',
@@ -416,6 +415,11 @@ export default {
           overHidden: true,
         },
         {
+          label: '备注',
+          prop: "remarks",
+          overHidden: true,
+        },
+        {
           label: "制单人",
           prop: "createUserName",
           searchProp: "createUser",
@@ -486,21 +490,21 @@ export default {
   },
   activated() {
     setTimeout(() => {
-      console.log(this.$route.query,400);
+      console.log(this.$route.query, 400);
       if (this.$route.query.srcId) {
         this.$store.commit("IN_LTCG_STATUS");
         this.editOpen({ id: this.$route.query.srcId }, 1)
       }
-        // 主页快捷跳转来的 直接打开新建订单
-        if (this.$route.query.showTrue) {
-            this.$store.commit("IN_LTCG_STATUS");
-            this.detailsOpen = true;
-        }
+      // 主页快捷跳转来的 直接打开新建订单
+      if (this.$route.query.showTrue) {
+        this.$store.commit("IN_LTCG_STATUS");
+        this.detailsOpen = true;
+      }
       if (this.$route.query.check) {
         this.editOpen({ id: this.$route.query.check.srcBillId }, 1)
         this.$store.commit("IN_LTCG_STATUS");
       }
-      if(this.$route.query.type == 'F'){
+      if (this.$route.query.type == 'F') {
         this.editOpen({ id: this.$route.query.detail.srcParentId }, 1)
       }
       this.detailData = {
@@ -528,34 +532,34 @@ export default {
     });
   },
   methods: {
-      // 导出
-      outExport() {
-          console.log(this.search,412)
-          let config = { params: { ...this.search } }
-          if (config.params) {
-              for (const propName of Object.keys(config.params)) {
-                  const value = config.params[propName];
-                  if (value !== null && typeof (value) !== "undefined") {
-                      if (value instanceof Array) {
-                          for (const key of Object.keys(value)) {
-                              let params = propName + '[' + key + ']';
-                              config.params[params] = value[key]
-                          }
-                          delete config.params[propName]
-                      }
-                  }
+    // 导出
+    outExport() {
+      console.log(this.search, 412)
+      let config = { params: { ...this.search } }
+      if (config.params) {
+        for (const propName of Object.keys(config.params)) {
+          const value = config.params[propName];
+          if (value !== null && typeof (value) !== "undefined") {
+            if (value instanceof Array) {
+              for (const key of Object.keys(value)) {
+                let params = propName + '[' + key + ']';
+                config.params[params] = value[key]
               }
+              delete config.params[propName]
+            }
           }
-          config.params.bsType = 'CG'
-          console.log(config,427)
-          const routeData = this.$router.resolve({
-              path: '/api/blade-sales-part/order/listExport',      //跳转目标下载地址
-              query: {
-                  ...config.params    //括号内是要传递给新窗口的参数
-              }
-          })
-          window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
-      },
+        }
+      }
+      config.params.bsType = 'CG'
+      console.log(config, 427)
+      const routeData = this.$router.resolve({
+        path: '/api/blade-sales-part/order/listExport',      //跳转目标下载地址
+        query: {
+          ...config.params    //括号内是要传递给新窗口的参数
+        }
+      })
+      window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+    },
     check(row) {
       this.form = row
       this.detailsOpen = true
@@ -606,9 +610,9 @@ export default {
       }).catch(() => {
       });
     },
-      // 点击搜索触发
+    // 点击搜索触发
     searchChange(params, done) {
-        this.page.currentPage = 1
+      this.page.currentPage = 1
       done();
       this.onLoad(this.page, params)
     },
@@ -643,7 +647,7 @@ export default {
     },
     expandChange(row) {
       if (!row.itemData) {
-        getDetails({ id: row.id})
+        getDetails({ id: row.id })
           .then(res => {
             this.dataList[row.$index].itemData = res.data.data.orderItemsList;
           })
@@ -686,7 +690,8 @@ export default {
   color: #fff;
   font-size: 10px;
 }
+
 /deep/ .el-col-md-8 {
-    width: 24.33333%;
+  width: 24.33333%;
 }
 </style>

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

@@ -77,6 +77,12 @@
                                 :value="item.contacts" />
                         </el-select>
                     </template>
+                    <tempalte slot="salerName">
+                        <dic-select v-model="form.salerName" placeholder="业务员" key="id" label="name"
+                            url="/blade-user/salerList" :filterable="true" @selectChange="dicChange('salerName', $event)"
+                            :disabled="isContacts">
+                        </dic-select>
+                    </tempalte>
                 </avue-form>
             </trade-card>
             <trade-card title="明细信息">
@@ -373,9 +379,9 @@ import {
 import { getToken } from "@/util/auth";
 import { isProcurement } from "@/api/basicData/configuration";
 import { getList as inventoryList } from "@/api/tirePartsMall/inventory";
+import dicSelect from "@/components/dicSelect/main";
 export default {
     name: "detailsPage",
-
     data() {
         return {
             inventoryData2: [],
@@ -625,14 +631,14 @@ export default {
                 {
                     label: '业务员',
                     disabled: false,
-                    prop: "salerId",
-                    type: "select",
-                    props: {
-                        label: "name",
-                        value: "id"
-                    },
-                    dicUrl: "/api/blade-user/salerList",
-                    filterable: true,
+                    prop: "salerName",
+                    // type: "select",
+                    // props: {
+                    //     label: "name",
+                    //     value: "id"
+                    // },
+                    // dicUrl: "/api/blade-user/salerList",
+                    // filterable: true,
                     // rules: [{
                     //     required: true,
                     //     message: " ",
@@ -1195,7 +1201,7 @@ export default {
             }
         }
     },
-    components: { SearchQuery, reportDialog, check, checkSchedule },
+    components: { SearchQuery, reportDialog, check, checkSchedule, dicSelect },
     props: {
         onLoad: Object,
         detailData: Object
@@ -1587,6 +1593,7 @@ export default {
                                 this.contactsOption = res.data.data.corpsAddrList
                                 this.form.recAddress = res.data.data.corpsAddrList[0].belongtoarea + res.data.data.corpsAddrList[0].detailedAddress
                                 this.form.salerId = res.data.data.salesmanId ? res.data.data.salesmanId : ''
+                                this.form.salerName = res.data.data.salesmanName ? res.data.data.salesmanName : ''
                             }
                         })
                     }
@@ -1604,6 +1611,7 @@ export default {
             this.contactsOption = ''
             this.form.recAddress = ''
             this.form.salerId = ''
+            this.form.salerName = ''
             this.KHgetListfun()
         },
         // 获取客户数据
@@ -1673,6 +1681,17 @@ export default {
             this.onLoadfun(this.page, params);
             done()
         },
+        dicChange(name, row) {
+            if (name == 'salerName') {
+                if (row) {
+                    this.form.salerId = row.id
+                    this.form.salerName = row.name
+                } else {
+                    this.form.salerId =null
+                    this.form.salerName = null
+                }
+            }
+        },
         // 标签页切换
         tabHandle(data) {
             if (data.name == 'searchList') {
@@ -2154,10 +2173,10 @@ export default {
                                     if (res.data.data.records.length) {
                                         res.data.data.records.forEach(e => {
                                             if (e.paramValue == 1) {
-                                                if (!this.form.storageId){
+                                                if (!this.form.storageId) {
                                                     loading.close();
                                                     return this.$message.error('请选择仓库')
-                                                } 
+                                                }
                                                 whetherExistenceFinancing({
                                                     bsType: "XS",
                                                     ...this.form
@@ -2474,7 +2493,6 @@ export default {
                             break
                         }
                     }
-                    this.form.salerName = this.form.$salerId ? this.form.$salerId : ''
                     this.form.storageName = this.form.$storageId ? this.form.$storageId : ''
                     submit({
                         bsType: "XS",

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

@@ -385,6 +385,11 @@ export default {
           label: '退货状态',
           prop: "returnsStatus",
           overHidden: true,
+        }, 
+        {
+          label: '备注',
+          prop: "remarks",
+          overHidden: true,
         },
         {
           label: '应结日期',

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

@@ -46,7 +46,6 @@
                         </el-dropdown-item>
                         <el-dropdown-item @click.native="checkScheduleDialog = true, checkId = form.id">审核进度
                         </el-dropdown-item>
-
                     </el-dropdown-menu>
                 </el-dropdown>
             </div>
@@ -843,7 +842,7 @@ export default {
                         });
                         checkOrder({ ...data }).then((res) => {
                             this.getDetail(res.data.data.id)
-                            this.$message.success('申请退款成功');
+                            this.$message.success('申请退货成功');
                             this.isApplySettlement = !this.isApplySettlement
                             loading.close();
                             console.log(res);