Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-mini-web

src/api/pages/mst/tableSet.js

@@ -0,0 +1,22 @@
+/**
+ * @desc   : 用户表格设置服务
+ * @author : 周兴
+ * @date   : 2024-07-31 14:37
+ */
+export default {
+  tableSetService: {
+    prefix: '/mdm-server/mst/tableSet/',
+    // 保存表格设置
+    saveTableSet:'save_table_set',
+  }
+}
+
+/**
+ * @desc   : 用户表格设置路由
+ * @author : 周兴
+ * @date   : 2024-02-01 16:03
+ */
+export const routeUrl = {
+  tableSet: {
+  }
+}

src/components/business/modal_table_filter/modal_table_filter.vue

@@ -226,7 +226,7 @@ export default {
      * @date   : 2023/4/4 17:01
      */
     refreshClient(tableRef, code, tableType, columns) {
-      let userTableSetting = vm.$store.state.user.userTableSetting;
+      let userTableSetting = vm.$store.state.user.userTableSetting || [];
       let filters = userTableSetting.filter(it => it.tableRef === tableRef && it.code === code && it.tableType === tableType)
       if (filters && filters.length > 0) {
         filters[0].columns.value = JSON.stringify(columns);
@@ -261,7 +261,7 @@ export default {
       })
       params.columns = columns;
       // 保存到数据库
-      this.excute(this.$service.userTableSetService, this.$service.userTableSetService.saveUserTableSet, params).then(res => {
+      this.excute(this.$service.tableSetService, this.$service.tableSetService.saveTableSet, params).then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {
           // 保存成功
           this.$Message.success(vm.$t('I_001', {'param': vm.$t('save')}))

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/components/table/dk-table/dk-table.vue

@@ -491,9 +491,9 @@ export default {
               ]
             },
             // 透视
-            {
-              code: 'perspective', name: vm.$t('perspective'), disabled: false, visible: self.perspectiveFlag
-            },
+            // {
+            //   code: 'perspective', name: vm.$t('perspective'), disabled: false, visible: self.perspectiveFlag
+            // },
             // <!--自适应列宽-->
             {
               code: 'adaption', name: vm.$t('adaption'), disabled: false, visible: true, children: [

src/config/index.js

@@ -329,6 +329,8 @@ export default {
     freezed: 't_psi_freeze',
     // 商品档案
     sku: 't_mst_goods_sku',
+    // 资金账户
+    moneyAccount:'t_mst_money_account'
   },
   /**
    *   @desc   : 在产盘点盘点状态

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:'选择销售订单',
 }
 
 /**
@@ -328,8 +329,8 @@ export const columns = {
   outAmt: '已出库金额',
   returnQty: '已出库退货数量',
   returnAmt: '已出库退货金额',
-  nonStdCode: '非标号',
-  oNonStdCode: '原非标号',
+  nonStdCode: '色号',
+  oNonStdCode: '原色号',
   whId: '仓库',
   addressArea: '客户区域',
   addressNo: '门牌号',
@@ -370,7 +371,7 @@ export const columns = {
   amteMeet:'剩余应付',
   pricePur:'采购价',
   itemPurAmt:'采购金额',
-  nonStandardCode:'非标号',
+  nonStandardCode:'色号',
   returnNo:'退货单号',
   returnQty1:'退货数量',
   priceReturn:'退货价',
@@ -734,6 +735,10 @@ export const columns = {
   flgCanPcLogin: '电脑登录',
   flgCanWxLogin:'手机登录',
   flgBusiness:'业务部门标识',
+  calculationFormula:'计算公式',
+  packageBox:'包装数量',
+  purchaseEnter:'入库中',
+  purchaseRealEnter:'已入库',
 }
 
 /**

src/mixins/index.js

@@ -354,6 +354,16 @@ export const indexMixin = {
       }
     },
     /**
+     * @desc   : 打开搜索重新计算表格高度
+     * @author : 周兴
+     * @date   : 2023/4/18 11:22
+     */
+    changeCollapse() {
+      setTimeout(() => {
+        this.resizeTable() // 重新计算表格高度
+      }, 300)
+    },
+    /**
      * @desc   : 设置查询条件
      * @author : 周兴
      * @date   : 2023/1/4 10:55
@@ -402,6 +412,7 @@ export const indexMixin = {
         // this.params.cpId = this.$store.state.user.cpId;
 
         // 如果主键id有值需要在新建时清空主键Id
+        console.log("this.params[this.primaryKey]",this.params)
         if (this.primaryKey && button === 'add' && this.params[this.primaryKey]) {
           this.params[this.primaryKey] = null;
         }
@@ -1033,9 +1044,8 @@ export const indexMixin = {
     showSetting(it, refName) {
       if (it) {
         it.userTableSetInfo = {
-          // ftyId: this.$store.state.user.ftyId,
           cpId: this.$store.state.user.cpId,
-          userId: this.$store.state.user.id,
+          staffId: this.$store.state.user.staffId,
           tableType: this.$config.userTableType.page,
           code: this.$route.name,
           tableRef: refName

src/view/fin/money-account/index.vue

@@ -65,6 +65,9 @@
         <DkFormItem prop="initBalance">
           <InputNumberPop v-model="formData.initBalance"/>
         </DkFormItem>
+        <DkFormItem prop="balance" v-if="modalParams.button === $config.formMode.edit">
+          <InputNumberPop v-model="formData.balance" :disabled="true"/>
+        </DkFormItem>
         <!--开户日期-->
         <DkFormItem prop="accDate" :label="$t('initDate')" :data-type="$config.dataType.date">
           <DatePickerPop v-model="formData.accDate" :short-cut-flag="true"/>
@@ -76,6 +79,9 @@
           <InputPop v-model="formData.remarks" textareaFlag/>
         </DkFormItem>
       </DkForm>
+      <!--附件-->
+      <DkPicWall v-model="formData.annexPaths"
+                 :table="$config.tables.moneyAccount" :accept="$config.uploadFileConfig.acceptPicType"></DkPicWall>
     </DkModal>
   </div>
 </template>
@@ -92,6 +98,7 @@ export default {
       // 资金类别
       macTypeList: [],
       formData: {
+        macId:null,
         macName: null,
         macType: null,
         initBalance: null,
@@ -102,6 +109,7 @@ export default {
         orgId: self.$store.state.user.orgId,
         staffId: self.$store.state.user.id,
         makeStaff: self.$store.state.user.id,
+        annexPaths:null,
       },
       //查询
       searchContent: [
@@ -176,6 +184,10 @@ export default {
      */
     saveData() {
       this.params.accDate = new Date(this.params.accDate).toDateStr();
+      // 部门
+      this.params.orgId = this.$store.state.user.orgId
+      // 员工
+      this.params.staffId = this.$store.state.user.staffId
       if (this.modalParams.button === this.$config.formMode.add) {
         return this.excute(this.$service.moneyAccountService, this.$service.moneyAccountService.insert, this.params);
       } else {

src/view/mst/goods/form.vue

@@ -79,6 +79,7 @@
             <SelectPop v-model="formData.subUnitId" :multiple="false"
                        :options="unitList.filter(it=>it.unitId != formData.unitId)"
                        :disabled="formData.unitId?!formData.flgSubUnit:true"
+                       @on-select-label="unitChange"
                        labelKey="unitName"
                        valueKey="unitId">
             </SelectPop>
@@ -88,10 +89,16 @@
                       v-if="showSubUnit">
             <InputNumberPop ref="conversionFactor"
                             v-model="formData.conversionFactor"
+                            @on-change="packageChange"
                             :disabled="formData.unitId?!formData.flgSubUnit:true"
                             :digits="this.digits"
             />
           </DkFormItem>
+          <!--计算公式-->
+          <DkFormItem prop="calculationFormula" v-if="showSubUnit" :span="12">
+            <InputPop ref="calculationFormula" v-model="formData.calculationFormula"
+                      :disabled="true"/>
+          </DkFormItem>
         </DkForm>
       </DkPanel>
       <!--  价格信息-->
@@ -159,10 +166,16 @@
           <DkFormItem prop="intoQty" :label="$t('openingIvtQty')" :required="true" data-type="number">
             <InputNumberPop ref="intoQty"
                             v-model="formData.intoQty"
+                            @on-change="intoQtyChange"
                             :disabled="formData.unitId?!formData.flgSubUnit:true"
                             :digits="this.digits"
             />
           </DkFormItem>
+          <!--包装数量-->
+          <DkFormItem prop="packageBox" v-if="showSubUnit" :required="true">
+            <InputPop ref="packageBox" v-model="formData.packageBox"
+                      :disabled="true"/>
+          </DkFormItem>
           <!--期初成本价-->
           <DkFormItem prop="priceInto" :label="$t('openingIvtAmt')" :required="true" data-type="number">
             <InputNumberPop ref="priceInto" v-model="formData.priceInto"/>
@@ -200,6 +213,7 @@ export default {
       categoryList: [],
       seriesList: [],
       unitList: [],
+      originalUnitList:[],
       formData: {
         skuCode: null,
         skuModel: null,
@@ -226,6 +240,8 @@ export default {
         priceLimited: 0, //销售售价
         priceOther: 0, //其他价
         remarks: null,
+        calculationFormula:null,
+        packageBox:null,
       },
     }
   },
@@ -251,14 +267,108 @@ export default {
      * @date   : 2024/5/27 10:46
      */
     unitClear(row) {
+      // if (row) {
+      //   this.digits = row['decimalPlaces']
+      // }
+      this.formData.subUnitId = null
+      this.formData.conversionFactor = null
+      this.formData.intoQty = null
+      this.formData.packageBox = null
+      if (this.formData.subUnitId && this.formData.conversionFactor && this.formData.unitId){
+        let unitName = null
+        let subUnitName = null
+        let units = this.originalUnitList.filter(it=>it.unitId == this.formData.unitId)
+        if (units && units.length > 0){
+          unitName = units[0].unitName;
+        }
+        let subUnits = this.originalUnitList.filter(it=>it.unitId == this.formData.subUnitId)
+        if (subUnits && subUnits.length > 0){
+          subUnitName = subUnits[0].unitName;
+        }
+        this.formData.calculationFormula = this.formData.conversionFactor + unitName + "=1" + subUnitName
+      }
+      else{
+        this.formData.calculationFormula = null
+      }
+    },
+    /**
+     * @desc   : 包装单位改变事件
+     * @author : 姜宁
+     * @date   : 2024/7/30 16:22
+     */
+    unitChange(row) {
       if (row) {
         this.digits = row['decimalPlaces']
       }
-      this.formData.subUnitId = null
       this.formData.conversionFactor = null
       this.formData.intoQty = null
+      this.formData.packageBox = null
+      if (this.formData.subUnitId && this.formData.conversionFactor && this.formData.unitId){
+        let unitName = null
+        let subUnitName = null
+        let units = this.originalUnitList.filter(it=>it.unitId == this.formData.unitId)
+        if (units && units.length > 0){
+          unitName = units[0].unitName;
+        }
+        let subUnits = this.originalUnitList.filter(it=>it.unitId == this.formData.subUnitId)
+        if (subUnits && subUnits.length > 0){
+          subUnitName = subUnits[0].unitName;
+        }
+        this.formData.calculationFormula = this.formData.conversionFactor + unitName + "=1" + subUnitName
+      }
+      else{
+        this.formData.calculationFormula = null
+      }
+    },
+    /**
+     * @desc   : 包装改变事件
+     * @author : 姜宁
+     * @date   : 2024/7/30 17:24
+     */
+    packageChange(row) {
+      this.formData.packageBox = null
+      if (this.formData.subUnitId && this.formData.conversionFactor && this.formData.unitId){
+        let unitName = null
+        let subUnitName = null
+        let units = this.originalUnitList.filter(it=>it.unitId == this.formData.unitId)
+        if (units && units.length > 0){
+          unitName = units[0].unitName;
+        }
+        let subUnits = this.originalUnitList.filter(it=>it.unitId == this.formData.subUnitId)
+        if (subUnits && subUnits.length > 0){
+          subUnitName = subUnits[0].unitName;
+        }
+        this.formData.calculationFormula = this.formData.conversionFactor + unitName + "=1" + subUnitName
+      }
+      else{
+        this.formData.calculationFormula = null
+      }
     },
+    /**
+     * @desc   : 期初数量改变事件
+     * @author : 姜宁
+     * @date   : 2024/7/31 10:24
+     */
+    intoQtyChange(){
+      if (this.formData.subUnitId && this.formData.conversionFactor && this.formData.unitId && this.formData.intoQty){
+        let unitName = null
+        let subUnitName = null
+        let units = this.originalUnitList.filter(it=>it.unitId == this.formData.unitId)
+        if (units && units.length > 0){
+          unitName = units[0].unitName;
+        }
+        let subUnits = this.originalUnitList.filter(it=>it.unitId == this.formData.subUnitId)
+        if (subUnits && subUnits.length > 0){
+          subUnitName = subUnits[0].unitName;
+        }
+        let box = Math.floor(this.formData.intoQty/this.formData.conversionFactor);
+        let piece = this.formData.intoQty%this.formData.conversionFactor;
+        this.formData.packageBox = box + subUnitName + piece + unitName;
 
+      }else{
+        this.formData.packageBox = null
+      }
+    },
     /**
      * @desc   : 数据校验
      * @author : 常皓宁
@@ -355,7 +465,8 @@ export default {
     getGoodsUnit() {
       this.excute(this.$service.unitService, this.$service.unitService.selectByCond, {}).then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {
-          this.unitList = res.data.list;
+          this.unitList = res.data.list.copy();
+          this.originalUnitList = res.data.list.copy();
         }
       })
     },
@@ -378,6 +489,16 @@ export default {
     setValuesByEdit(data) {
       if (data) {
         this.formData = data;
+        if (this.formData.subUnitId && this.formData.conversionFactor && this.formData.unitId){
+          //计算公式
+          this.formData.calculationFormula = this.formData.conversionFactor + data.unitName + "=1" + data.subUnitName
+          //包装数量
+          if (this.formData.intoQty){
+            let box = Math.floor(this.formData.intoQty/this.formData.conversionFactor);
+            let piece = this.formData.intoQty%this.formData.conversionFactor;
+            this.formData.packageBox = box + data.subUnitName + piece + data.unitName;
+          }
+        }
       }
     },
 
@@ -436,7 +557,6 @@ export default {
      * @date   : 2024/4/8 16:30
      */
     saveData() {
-      console.log('this.params', this.params)
       if (this.type === this.$config.formMode.add) {
         return this.excute(this.$service.goodsService, this.$service.goodsService.insert, this.params);
       } else if (this.type === this.$config.formMode.edit) {

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: {
@@ -328,20 +316,26 @@ export default {
           valueKind: 'M-CHOICE'
         },
         {
-          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'
         },
+        {
+          itemCode: '商品名称-文本',
+          itemName: 'skuModel',
+          valueFormat: {code: 'skuModel'},
+          valueKind: 'STR'
+        },
+        {
+          itemCode: '商品名称-文本',
+          itemName: 'skuName',
+          valueFormat: {code: 'skuName'},
+          valueKind: 'STR'
+        },
       ],
     }
   },

src/view/pur/pur-track-report/index.vue

@@ -1,6 +1,6 @@
 <!-- @desc:采购跟踪  @auth:常皓宁  @time:2024/04/22 09:15 -->
 <template>
-  <div slot="top">
+  <div class="main-div">
     <DkTabs v-model="tabsModel" :options="tabsOptions" @on-click="tabsClick"></DkTabs>
     <!--    采购订单-->
     <DkCollapse @on-change="changeCollapse" ref="collapse" v-if="this.tabsModel ==='purchase' ">
@@ -50,7 +50,7 @@
                      majorField="purItemId"
                      :data="purChaseItemList"
                      :columns="goodsColumns"
-                     :height="400"
+                     :height="tableHeight + 34"
                      :freeze="false"
                      :show-footer="true"
                      :delete-flag="false"
@@ -107,7 +107,7 @@
                      majorField="intoItemId"
                      :data="purEntryItemList"
                      :columns="purEntryColumns"
-                     :height="400"
+                     :height="tableHeight+ 34"
                      :freeze="false"
                      :show-footer="true"
                      :delete-flag="false"
@@ -164,7 +164,7 @@
                      majorField="retuenItemId"
                      :data="purReturnItemList"
                      :columns="purReturnColumns"
-                     :height="400"
+                     :height="tableHeight+ 34"
                      :freeze="false"
                      :show-footer="true"
                      :delete-flag="false"
@@ -183,7 +183,7 @@
                      majorField="retuenItemId"
                      :data="purPayData"
                      :columns="purPayColumns"
-                     :height="400"
+                     :height="tableHeight+ 34"
                      :freeze="false"
                      :show-footer="true"
                      :delete-flag="false"
@@ -197,8 +197,7 @@
 </template>
 
 <script>
-import {indexMixin} from '@/mixins'
-import {formMixin} from "@/mixins/form";
+import {formMixin} from '@/mixins/form'
 
 export default {
   name: "pur-track-report",