修改bug

src/views/businessManagement/purchaseOrder/index.vue

@@ -504,23 +504,47 @@ export default {
       }
       let a = []
       this.selection.forEach(item => {
-        let form = {
-          srcOrderno:item.orderNo,
-          itemType:"采购",
-          optionType:"GN",
-          corpsName:item.strCorpName,
-          corpId:item.corpId,
-          srcParentId: item.id,
-          currency: 'CNY',
-          exchangeRate: '1',
-          taxRate: '0',
-          accDate: item.businesDate,
-          srcType: 1,
-          tradeType: 'GN',
-          amount: item.orderAmount,
-          costType: this.feesOption.find(e => e.cname == '货款')? this.feesOption.find(e => e.cname == '货款').id: null,
-        }
-        a.push(form)
+        item.itemsList = item.itemsList? item.itemsList: [];
+        item.itemsList.forEach(e => {
+          let form = {
+            srcOrderno:item.orderNo,
+            itemType:"采购",
+            optionType:"GN",
+            corpsName: item.strCorpName,
+            corpId:item.corpId,
+            srcParentId: item.id,
+            currency: 'CNY',
+            exchangeRate: '1',
+            taxRate: '0',
+            accDate: item.businesDate,
+            srcType: 1,
+            tradeType: 'GN',
+            costType: this.feesOption.find(e => e.cname == '货款')? this.feesOption.find(e => e.cname == '货款').id: null,
+            goodName: e.goodsName,
+            price: e.price,
+            quantity: e.orderQuantity,
+            unit: e.unit,
+            amount: e.amount,
+          }
+          a.push(form)
+        })
+        // let form = {
+        //   srcOrderno:item.orderNo,
+        //   itemType:"采购",
+        //   optionType:"GN",
+        //   corpsName:item.strCorpName,
+        //   corpId:item.corpId,
+        //   srcParentId: item.id,
+        //   currency: 'CNY',
+        //   exchangeRate: '1',
+        //   taxRate: '0',
+        //   accDate: item.businesDate,
+        //   srcType: 1,
+        //   tradeType: 'GN',
+        //   amount: item.orderAmount,
+        //   costType: this.feesOption.find(e => e.cname == '货款')? this.feesOption.find(e => e.cname == '货款').id: null,
+        // }
+        // a.push(form)
       })
       this.applyPaymentList = [...a]
       // this.beforeBillData(true);

src/views/businessManagement/salesOrder/configuration/commodity.json

@@ -50,6 +50,13 @@
       ]
     },
     {
+      "label": "订货数量",
+      "prop": "orderQuantity",
+      "slot": true,
+      "overHidden": true,
+      "width": 120
+    },
+    {
       "label": "商品类别",
       "prop": "goodsTypeName",
       "hide": true,
@@ -117,12 +124,6 @@
       "overHidden": true
     },
     {
-      "label": "订货数量",
-      "prop": "orderQuantity",
-      "slot": true,
-      "overHidden": true
-    },
-    {
       "label": "商品图片",
       "prop": "url",
       "type": "upload",

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -23,7 +23,7 @@
             审核处理<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item :disabled="browse" @click.native="pleaseCheck">请核数据</el-dropdown-item>
+            <el-dropdown-item :disabled="browse || detailData.seeDisabled" @click.native="pleaseCheck">请核数据</el-dropdown-item>
             <el-dropdown-item v-if="form.status > 0" @click.native="checkScheduleDialog = true,checkId=form.id">审核进度</el-dropdown-item>
             <el-dropdown-item v-if="form.status == 1" @click.native="repealCancel">撤销请核</el-dropdown-item>
             <el-dropdown-item v-if="checkDisabled" @click.native="changeApproveOpen">特殊审批</el-dropdown-item>
@@ -2403,6 +2403,7 @@ export default {
           this.$set(this.goodsListSave[item], 'invoiceWeight', this.goodsListSave[item].cartonWeight)
           this.$set(this.goodsListSave[item], 'shopQuality', 0)
           this.$set(this.goodsListSave[item], 'inputMold', 0) // 判断是商品还是政策 商品 0 特价 1 买赠2
+          this.$set(this.goodsListSave[item], 'priceType', this.goodsListSave[item].policyName)
           this.goodsListSave[item].amount = 0
           if (this.goodsActives == "goods") {
             this.$set(this.goodsListSave[item], 'goodType', 0)
@@ -2456,18 +2457,19 @@ export default {
           itemType: this.tableData[item].typeno,
           tradeType: 'GN'
         }).then(res => {
-          this.tableData[item].priceCategory = this.tableData[item].goodsTypeName
-          this.tableData[item].storageQuantity =  res.data.data
-          delete this.tableData[item].goodsTypeName
-          this.tableData[item].itemId = this.tableData[item].id
-          this.$set(this.tableData[item], 'corpName', this.tableData[item].corpName)
-          this.$set(this.tableData[item], 'itemType', this.tableData[item].typeno)
-          // this.$set(this.tableData[item], 'orderQuantity', 1)
-          this.$set(this.tableData[item], 'actualQuantity', 0)
-          this.$set(this.tableData[item], 'shopQuality', 0)
-          this.$set(this.tableData[item], 'invoiceWeight', this.tableData[item].cartonWeight)
-          this.$set(this.tableData[item], 'inputMold', 0)
-          this.tableData[item].amount = 0
+          this.tableData[item].priceCategory = this.tableData[item].goodsTypeName;
+          this.tableData[item].storageQuantity =  res.data.data;
+          delete this.tableData[item].goodsTypeName;
+          this.tableData[item].itemId = this.tableData[item].id;
+          this.$set(this.tableData[item], 'corpName', this.tableData[item].corpName);
+          this.$set(this.tableData[item], 'itemType', this.tableData[item].typeno);
+          // this.$set(this.tableData[item], 'orderQuantity', 1);
+          this.$set(this.tableData[item], 'actualQuantity', 0);
+          this.$set(this.tableData[item], 'shopQuality', 0);
+          this.$set(this.tableData[item], 'invoiceWeight', this.tableData[item].cartonWeight);
+          this.$set(this.tableData[item], 'inputMold', 0);
+          this.$set(this.tableData[item], 'priceType', this.tableData[item].policyName);
+          this.tableData[item].amount = 0;
           if (this.goodsActives == "goods") {
             this.$set(this.tableData[item], 'goodType', 0)
           } else {

src/views/businessManagement/salesOrder/index.vue

@@ -74,6 +74,7 @@
             type="text"
             size="small"
             @click="saveSell(scope.row)"
+            :disabled="scope.row.status < 3"
           >生成采购</el-button>
           <el-button
             type="text"

src/views/workManagement/handoverSheet/detail.vue

@@ -159,6 +159,15 @@
           </template>
         </avue-crud>
       </basic-container>
+      <containerTitle title="客户未收款"/>
+      <basic-container>
+        <avue-form
+          ref="detailForm"
+          class="trading-form"
+          v-model="form"
+          :option="detailOption"
+        ></avue-form>
+      </basic-container>
     </div>
 
     <el-dialog
@@ -299,6 +308,25 @@ export default {
           },
         ],
       },
+      detailForm: {},
+      detailOption: {
+        menuBtn: false,
+        labelWidth: 100,
+        column: [
+          {
+            label: "客户名称",
+            prop: "corpName",
+            disabled:true,
+            span: 8,
+          },
+          {
+            label: "未收金额",
+            prop: "uncollectedAmount",
+            disabled: true,
+            span: 8,
+          }
+        ],
+      },
       dataList: [],
       tableOption: {},
       goodsoptions: [],