采购订单改动

src/components/business/table-select/table-select.vue

@@ -1308,7 +1308,7 @@ export default {
         // 查询条件
         this.searchContent = [
           {
-            valueFormat: {code: 'skuCode'},
+            valueFormat: {code: 'skuModel'},
           },
           {
             valueFormat: {code: 'skuName'},

src/libs/update-columns/index.js

@@ -110,6 +110,7 @@ export default {
   purchaseReturnColum: [
     {updateField: 'skuId', valueFiled: 'skuId'},
     {updateField: 'skuCode', valueFiled: 'skuCode'},
+    {updateField: 'skuModel', valueFiled: 'skuModel'},
     {updateField: 'skuName', valueFiled: 'skuName'},
     {updateField: 'returnQty', valueFiled: 'returnQty', defaultValue: -1},
     {updateField: 'intoQty', valueFiled: 'usableQty'},
@@ -126,6 +127,7 @@ export default {
    */
   purchaseEntryColum: [
     {updateField: 'skuCode', valueFiled: 'skuCode'},
+    {updateField: 'skuModel', valueFiled: 'skuModel'},
     {updateField: 'itemQty', valueFiled: 'itemQty', defaultValue: 1},
     {updateField: 'skuId', valueFiled: 'skuId'},
     {updateField: 'skuName', valueFiled: 'skuName'},
@@ -146,6 +148,7 @@ export default {
    */
   purchaseColum: [
     {updateField: 'skuCode', valueFiled: 'skuCode'},
+    {updateField: 'skuModel', valueFiled: 'skuModel'},
     {updateField: 'itemQty', valueFiled: 'itemQty', defaultValue: 1},
     {updateField: 'skuId', valueFiled: 'skuId'},
     {updateField: 'skuName', valueFiled: 'skuName'},

src/locale/lang/zh-CN.js

@@ -117,6 +117,7 @@ export const button = {
   addOutReturn:'出库退货',
   refreshReport: '更新报表',
   chooseSalesForPurchase:'选择销售订单',
+  purchaseBasedOnSales:'选择销售订单',
 }
 
 /**
@@ -736,6 +737,8 @@ export const columns = {
   flgBusiness:'业务部门标识',
   calculationFormula:'计算公式',
   packageBox:'包装数量',
+  purchaseEnter:'入库中',
+  purchaseRealEnter:'已入库',
 }
 
 /**

src/view/pur/pur-by-sale/index.vue

@@ -640,7 +640,11 @@ export default {
       // 合计金额
       this.params.sumAmount = insertTale.sum('sumAmount').toFixed(2)
       // 采购折扣
-      this.params.purDiscount = (parseFloat(insertTale.sum('sumAmount').toFixed(2) )/ parseFloat(insertTale.sum('sumStandard').toFixed(2)) * 100).toFixed(2)
+      let purDiscount = 100
+      if (insertTale.sum('sumStandard') !== 0){
+        purDiscount = (parseFloat(insertTale.sum('sumAmount').toFixed(2) )/ parseFloat(insertTale.sum('sumStandard').toFixed(2)) * 100).toFixed(2)
+      }
+      this.params.purDiscount =  purDiscount
       // 应付金额
       this.params.amtPayable = this.params.sumAmount
       // 还款金额
@@ -663,7 +667,10 @@ export default {
         // 合计金额 = 商品数量 * 采购价
         let sumAmount = parseFloat(row['itemQty']) * parseFloat(row['pricePur']);
         // 折扣
-        let priceDiscount =  (parseFloat(row['pricePur']) / parseFloat(row['pricePurchase']) * 100).toFixed(2);
+        let priceDiscount = 100;
+        if (parseFloat(row['pricePurchase']) !== 0){
+          priceDiscount =  (parseFloat(row['pricePur']) / parseFloat(row['pricePurchase']) * 100).toFixed(2)
+        }
         this.$set(item, 'sumStandard', sumStandard)
         this.$set(item, 'sumAmount', sumAmount)
         // 标价
@@ -692,6 +699,7 @@ export default {
      * @date   : 2024/7/25 14:33
      */
     saveData() {
+      this.typeData = this.$config.formMode.add
       return this.excute(this.$service.purOrderService, this.$service.purOrderService.insert, this.params)
     },
     /***************************列表及其他事件************************************/

src/view/pur/pur-order/form.vue

@@ -88,7 +88,7 @@
               </DkFormItem>
               <!--货物金额-->
               <DkFormItem prop="sumAmount" class="amount">
-                <InputNumberPop ref="sumAmount" :v-model="goodsFootFormData.sumAmount" :clearable="false"
+                <InputNumberPop ref="sumAmount" v-model="goodsFootFormData.sumAmount" :clearable="false"
                                 :digits="2" :readonly="true"/>
               </DkFormItem>
               <!--标价总额-->
@@ -126,9 +126,9 @@
         <!--按钮区-->
         <BaseIndexButtonGroup ref="BaseIndexButtonGroup" id="BaseIndexButtonGroup">
           <template #left>
-            <BaseIndexButton ref="purchaseBasedOnSales" name="purchaseBasedOnSales"
+            <BaseIndexButton ref="search" name="search"
                              @click="purchaseBasedOnSales(true)"></BaseIndexButton>
-            <BaseIndexButton ref="clearPurchaseBasedOnSales" name="clearPurchaseBasedOnSales"
+            <BaseIndexButton ref="clear" name="clear"
                              @click="clearPurchaseBasedOnSales(true)"></BaseIndexButton>
           </template>
         </BaseIndexButtonGroup>
@@ -196,8 +196,8 @@ export default {
         // {field: 'makingTime'},//订单日期
         // {field: 'entryTime'},//预计送货日期
         // {field: 'outStatusStringDetail'},//单据状态
-        // {field: 'customerName'},//客户名称
-        // {field: 'customerPhone'},//客户电话
+        {field: 'cusName'},//客户名称
+        {field: 'cusPhone'},//客户电话
         // {field: 'addressFull'},//客户地址
         // {field: 'orgName'},//业务部门
         // {field: 'staffName'},//业务员
@@ -245,7 +245,7 @@ export default {
       purchaseItemList: [],
       goodsColumns: [
         {
-          field: 'skuCode',
+          field: 'skuModel',
           controlId: 'skuId',
           treeNode: true,
           type: 'tableSelect',
@@ -329,13 +329,13 @@ export default {
         //   },
         // },
         {
-          field: 'unitInfo',
+          field: 'packBox',
           title: self.$t('boxPiece'),
-          type: 'nonStandard',
+          type: 'disabled',
         },
         {
           field: 'remarks',
-
+          type: 'text',
         },
       ],
       warehouseList: [],//仓库
@@ -383,11 +383,9 @@ export default {
      */
     getTotals(field, row, rowIndex) {
       let table = this.$refs['detailTable'].tableData
-      console.log('table',table)
       if (table && table.length > 0) {
         //计算合计
         this.getTotale(table)
-
         table.forEach(row => {
           if (!row["itemQty"] || row["itemQty"] == '') {
             this.$set(row, 'itemQty', 0);
@@ -395,9 +393,7 @@ export default {
           if (!row["itemAmt"] || row["itemQty"] == '') {
             this.$set(row, 'itemAmt', 0);
           }
-
           this.decimalPlaces = row['decimalPlaces']
-
           if(row['subUnitId']){
             row.nonStandardForm = {
               formula: (row['subUnitName']?'1'+row['subUnitName']+ '=':'' ) + row['packBox'] + row['unitName'],
@@ -444,9 +440,11 @@ export default {
       let sumStandard = 0;  // 标价总额
       if (table && table.length > 0) {
         table.forEach(row => {
+          row["itemAmt"] = parseFloat(row["pricePur"]) * parseFloat(row["itemQty"]);
+          row["amtStd"] = parseFloat(row["pricePurchase"]) * parseFloat(row["itemQty"]);
           sumQuantity += parseFloat(row["itemQty"]);
-          sumAmount += parseFloat(row["itemAmt"])
-          sumStandard += parseFloat(row["pricePurchase"]) * parseFloat(row["itemQty"]);
+          sumAmount += row["itemAmt"];
+          sumStandard += row["amtStd"];
         })
       }
       this.goodsFootFormData.sumQuantity = sumQuantity;
@@ -500,8 +498,9 @@ export default {
           this.$set(item, 'fromId', row['orderId'])
           //销售订单明细ID
           this.$set(item, 'fromItemId', row['itemId'])
+          this.$set(item, 'packBox', row['packBox'])
           // 不可查询
-          this.$set(item, 'readOnly', ['skuCode','skuName'])
+          this.$set(item, 'readOnly', ['skuModel','skuName'])
           // 去掉销售订单明细Id
           delete row['itemId']
         })
@@ -522,6 +521,8 @@ export default {
         this.formData.fromNos = fromNos
         this.formData.fromIds = fromIds
         this.chooseFlag = false
+        //计算合计
+        this.getTotale(this.purchaseItemList)
       }
     },
 
@@ -666,7 +667,11 @@ export default {
         // 合计金额
         this.params.sumAmount = insertTale.sum('sumAmount').toFixed(2)
         // 采购折扣
-        this.params.purDiscount = (parseFloat(insertTale.sum('sumAmount').toFixed(2) )/ parseFloat(insertTale.sum('sumStandard').toFixed(2)) * 100).toFixed(2)
+        let purDiscount = 100
+        if (insertTale.sum('sumStandard') !== 0){
+          purDiscount = (parseFloat(insertTale.sum('sumAmount').toFixed(2) )/ parseFloat(insertTale.sum('sumStandard').toFixed(2)) * 100).toFixed(2)
+        }
+        this.params.purDiscount =  purDiscount
         // 应付金额
         this.params.amtPayable = this.params.sumAmount
         // 还款金额
@@ -677,9 +682,7 @@ export default {
       else if (this.type === this.$config.formMode.edit){
         // 修改的表数据 和 新增的表数据
         // let changeTable = this.$refs.detailTable.getTableChangeData();
-        // console.log('changeTable',changeTable)
         let tableData = this.$refs.detailTable.getTableData()
-        console.log('tableData',tableData)
         let editTable = this.countItem(tableData)
         this.params.editPurchaseItemList = editTable
         // 商品总数量
@@ -689,7 +692,11 @@ export default {
         // 合计金额
         this.params.sumAmount = editTable.sum('sumAmount').toFixed(2)
         // 采购折扣
-        this.params.purDiscount = (parseFloat(editTable.sum('sumAmount').toFixed(2) )/ parseFloat(editTable.sum('sumStandard').toFixed(2)) * 100).toFixed(2)
+        let purDiscount = 100
+        if (editTable.sum('sumStandard') !== 0){
+          purDiscount = (parseFloat(insertTale.sum('sumAmount').toFixed(2) )/ parseFloat(editTable.sum('sumStandard').toFixed(2)) * 100).toFixed(2)
+        }
+        this.params.purDiscount =  purDiscount
         // 应付金额
         this.params.amtPayable = this.params.sumAmount
         // 还款金额
@@ -719,7 +726,10 @@ export default {
         // 合计金额 = 商品数量 * 采购价
         let sumAmount = parseFloat(row['itemQty']) * parseFloat(row['pricePur']);
         // 折扣
-        let priceDiscount =  (parseFloat(row['pricePur']) / parseFloat(row['pricePurchase']) * 100).toFixed(2);
+        let priceDiscount = 100;
+        if (parseFloat(row['pricePurchase']) !== 0){
+          priceDiscount =  (parseFloat(row['pricePur']) / parseFloat(row['pricePurchase']) * 100).toFixed(2)
+        }
         this.$set(item, 'sumStandard', sumStandard)
         this.$set(item, 'sumAmount', sumAmount)
         // 标价
@@ -748,7 +758,6 @@ export default {
      * @date   : 2024-02-19 10:47
      */
     saveData() {
-      console.log('this.params', this.params)
       return this.type === this.$config.formMode.add ?
         this.excute(this.$service.purOrderService, this.$service.purOrderService.insert, this.params)
         : this.excute(this.$service.purOrderService, this.$service.purOrderService.update, this.params)
@@ -825,10 +834,9 @@ export default {
             {code:'piece',label:row['unitName'],type:'number',field:'piece'}
           ]
         }
-        console.log('row',row)
         if(row['intoStatus'] != this.$config.intoStatus.daiRuKu){
           // 不可查询
-          this.$set(item, 'readOnly', ['skuCode','skuName'])
+          this.$set(item, 'readOnly', ['skuModel','skuName'])
         }
       })
       this.purchaseItemList = purchaseItemResponseList
@@ -875,7 +883,6 @@ export default {
    * @date   : 2022/3/3 10:32
    */
   created() {
-    console.log('ttt',this.$route)
     this.resizeTableFlag = true;  // 计算表格高度
     if(this.type === this.$config.formMode.add){
       this.goodsColumns = this.goodsColumns.filter(it=> it.field != 'ingIntoQty')

src/view/pur/pur-order/index.vue

@@ -170,8 +170,8 @@ export default {
       // 模式切换值
       tabsModel: 'orderAll',
       tabsOptions: [{label: self.$t('orderAll'), name: 'orderAll'}, //全部订单
-        {label: self.$t('purchaseOrder'), name: 'purchaseOrder'}, //采购暂存
-        {label: self.$t('purchaseReal'), name: 'purchaseReal'},//采购成交
+        {label: self.$t('purchaseEnter'), name: 'purchaseOrder'}, //采购暂存
+        {label: self.$t('purchaseRealEnter'), name: 'purchaseReal'},//采购成交
       ],
       detailModel: 'goodsDetail',
       detailOptions: [{label: self.$t('goodsDetail'), name: 'goodsDetail'}, //货物明细
@@ -182,7 +182,7 @@ export default {
       tableDataDetail_files: [],  // 用于存放订单附件
       tableDataTitle_goodsDetail: [
         {field: 'skuName'},
-        {field: 'skuCode'},
+        {field: 'skuModel'},
         //采购数量
         {
           field: 'itemQty',
@@ -305,18 +305,6 @@ export default {
           magnifierType: self.$config.MagnifierType.supplier,
         },
         {
-          itemCode: '收货人-文本',
-          itemName: 'contactName',
-          valueFormat: {code: 'contactName'},
-          valueKind: 'STR'
-        },
-        {
-          itemCode: '收货电话-文本',
-          itemName: 'telephone',
-          valueFormat: {code: 'contactPhone'},
-          valueKind: 'STR'
-        },
-        {
           itemCode: '入库状态-下拉',
           itemName: 'intoStatusName',
           valueFormat: {
@@ -329,15 +317,21 @@ export default {
         },
         {
           itemCode: '商品名称-文本',
+          itemName: 'skuModel',
+          valueFormat: {code: 'skuModel'},
+          valueKind: 'STR'
+        },
+        {
+          itemCode: '商品名称-文本',
           itemName: 'skuName',
           valueFormat: {code: 'skuName'},
           valueKind: 'STR'
         },
         {
-          itemCode: '采购日期-时间',
-          itemName: 'pickupDate',
+          itemCode: '制单日期-时间',
+          itemName: 'makeTime',
           valueFormat: {
-            code: 'pickupDate',
+            code: 'makeTime',
             default: [new Date().addMonths(-1).format('yyyy-MM-dd'), new Date().format('yyyy-MM-dd')]
           },
           valueKind: 'DATE_RANGE'