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

src/components/base/dk-date-picker-pop/dk-date-picker-pop.vue

@@ -84,6 +84,11 @@
         type: Boolean,
         default: true
       },
+      // 是否选择当前日期之前的日期
+      minFlag: {
+        type: Boolean,
+        default: false
+      },
     },
     data() {
       let self = this
@@ -190,6 +195,15 @@
       getOptions() {
         if (this.shortCutFlag) {
           let options = {}
+
+          if(this.minFlag && this.type === 'date'){
+            options = {
+              disabledDate(date){
+                return date && date.valueOf() < Date.now() - 86400000;
+              }
+            }
+          }
+
           if (this.type === 'daterange') { // 日期范围
             options.shortcuts = [
               {

src/components/base/input-pop/input-pop.vue

@@ -157,7 +157,7 @@ export default {
     // 行数
     areaRows: {
       type: Number,
-      default: 1
+      default: 3
     },
     // 添加tab中使用
     addTabInputFlag: {

src/components/base/select-pop/select-pop.vue

@@ -230,6 +230,7 @@ export default {
       }
     },
     options(n, o) {
+      // console.log('options',n)
       this.optionsData = n;
       // 那么多选超过2个就要开
       if (this.multiple && n && n.length > 2) {

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'},
@@ -196,6 +199,9 @@ export default {
     {updateField: 'packBox', valueFiled: 'packBox'},
     {updateField: 'unitId', valueFiled: 'unitId'},
     {updateField: 'subUnitId', valueFiled: 'subUnitId'},
+    {updateField: 'unitName', valueFiled: 'unitName'},
+    {updateField: 'subUnitName', valueFiled: 'subUnitName'},
+    {updateField: 'decimalPlaces' , valueFiled: 'decimalPlaces'},
   ],
 
   /**

src/locale/lang/zh-CN.js

@@ -117,6 +117,7 @@ export const button = {
   addOutReturn:'出库退货',
   refreshReport: '更新报表',
   chooseSalesForPurchase:'选择销售订单',
+  purchaseBasedOnSales:'选择销售订单',
 }
 
 /**
@@ -275,7 +276,9 @@ export const columns = {
   expand: '展开',
   collapse: '折叠',
   orgId: '组织',
+  deptOrg:'申请部门',
   staffId: '员工',
+  deptStaff:'申请员工',
   parentName: '上级组织',
   staffIds: '业务员',
   staffNames: '员工',
@@ -731,6 +734,11 @@ export const columns = {
   inboundProcessingFlag:'开单并入库办理标识',
   flgCanPcLogin: '电脑登录',
   flgCanWxLogin:'手机登录',
+  flgBusiness:'业务部门标识',
+  calculationFormula:'计算公式',
+  packageBox:'包装数量',
+  purchaseEnter:'入库中',
+  purchaseRealEnter:'已入库',
 }
 
 /**

src/view/fin/other-payable/form.vue

@@ -40,7 +40,7 @@
                             :min="-9999999999"/>
           </DkFormItem>
           <!--备注-->
-          <DkFormItem prop="remarks" :span="12">
+          <DkFormItem prop="remarks" :span="24">
             <InputPop ref="remarks" v-model="formData.remarks"
                       maxlength=500 textareaFlag/>
           </DkFormItem>

src/view/fin/other-receivable/form.vue

@@ -46,7 +46,7 @@
                             :min="-9999999999"/>
           </DkFormItem>
           <!--备注-->
-          <DkFormItem prop="remarks">
+          <DkFormItem prop="remarks" :span="24">
             <InputPop ref="remarks" v-model="formData.remarks"
                       maxlength=500 textareaFlag/>
           </DkFormItem>

src/view/fin/payment/form.vue

@@ -39,7 +39,7 @@
                            :short-cut-flag="true"/>
           </DkFormItem>
           <!--备注-->
-          <DkFormItem prop="remarks" :span="12">
+          <DkFormItem prop="remarks" :span="24">
             <InputPop ref="remarks" v-model="formData.remarks"
                       maxlength=500 textareaFlag/>
           </DkFormItem>

src/view/fin/receipt/form.vue

@@ -44,7 +44,7 @@
                            :short-cut-flag="true"/>
           </DkFormItem>
           <!--备注-->
-          <DkFormItem prop="remarks">
+          <DkFormItem prop="remarks" :span="24">
             <InputPop ref="remarks" v-model="formData.remarks"
                       maxlength=500 textareaFlag/>
           </DkFormItem>

src/view/ivt/entry-handle/form.vue

@@ -78,7 +78,7 @@
                              type="date" :short-cut-flag="true" />
             </DkFormItem>
             <!--备注-->
-            <DkFormItem prop="remarks" :span="12">
+            <DkFormItem prop="remarks" :span="24">
               <InputPop ref="remarks" v-model="formData.remarks"
                         maxlength=500 textareaFlag/>
             </DkFormItem>

src/view/ivt/ivt-check/form.vue

@@ -31,14 +31,14 @@
                              @ok="staffOk"
                              :multiple="false"/>
           </DkFormItem>
-          <!--备注-->
-          <DkFormItem prop="remarks">
-            <InputPop v-model="formData.remarks" textareaFlag/>
-          </DkFormItem>
           <!--锁库标识-->
           <DkFormItem prop="flgLock" :label="$t('flgLock')">
             <dk-switch v-model="formData.flgLock"/>
           </DkFormItem>
+          <!--备注-->
+          <DkFormItem prop="remarks" :span="24">
+            <InputPop v-model="formData.remarks" textareaFlag/>
+          </DkFormItem>
         </DkForm>
       </DkPanel>
       <!--商品信息-->

src/view/ivt/ivt-freeze/form.vue

@@ -28,7 +28,7 @@
             <InputPop ref="cusName"  v-model="formData.cusName" :readonly="true"/>
           </DkFormItem>
           <!--业务部门-->
-          <DkFormItem prop="orgId" :label="$t('orgId')" :required="true">
+          <DkFormItem prop="orgId" :label="$t('deptOrg')" :required="true">
             <SelectMagnifier v-model="formData.orgId" :display-text="formData.orgName"
                              :type="this.$config.MagnifierType.org"
                              @ok="orgOk"
@@ -36,7 +36,7 @@
                              :multiple="false"/>
           </DkFormItem>
           <!--业务员-->
-          <DkFormItem prop="staffId" :label="$t('staffId')" :required="true">
+          <DkFormItem prop="staffId" :label="$t('deptStaff')" :required="true">
             <SelectMagnifier v-model="formData.staffId" :display-text="formData.staffName"
                              :type="this.$config.MagnifierType.staff"
                              @ok="staffOk"
@@ -46,15 +46,15 @@
           <!--自动解冻时间-->
           <DkFormItem prop="autoUnfreezeDate" :data-type="$config.dataType.autoUnfreezeDate">
             <DatePickerPop v-model="formData.autoUnfreezeDate"  :readonly="checkColumnIsEdit('autoUnfreezeDate')"
-                           :short-cut-flag="true"/>
+                           :short-cut-flag="true" :min-flag="true"/>
           </DkFormItem>
           <!--商品总数量-->
           <DkFormItem prop="sumQuantity">
             <InputNumberPop ref="sumQuantity" v-model="formData.sumQuantity" :readonly="true"/>
           </DkFormItem>
           <!--备注-->
-          <DkFormItem prop="remarks">
-            <InputPop ref="remarks" v-model="formData.remarks" />
+          <DkFormItem prop="remarks" :span="24">
+            <InputPop ref="remarks" v-model="formData.remarks" textareaFlag/>
           </DkFormItem>
         </DkForm>
       </DkPanel>
@@ -64,9 +64,11 @@
           <EditTable ref="goodsTable" :data="formData.itemList" showFooter
                      major-field="itemId"
                      control-id="invId"
-                     :new-row-flag="true" :height="tableHeight"
+                     :new-row-flag="true" :height="400"
                      :columns="this.type === this.$config.formMode.add ? freezeItemColumns: unfreezeItemColumns"
                      @changeValue="getTotals"
+                     @on-choose="getTotals"
+                     @changeNonStandard="changeNonStandard"
           ></EditTable>
         </div>
       </DkPanel>
@@ -94,15 +96,15 @@ export default {
     let self = this
     return {
       formData: {
-        orgId: null,
+        orgId: self.$store.state.user.orgId,
         makeStaff: self.$store.state.user.id,
-        staffId: null,
-        staffName: null,
+        staffId: self.$store.state.user.staffId,
+        staffName: self.$store.state.user.staffName,
         staffCode: null,
         cusId:null,
         cusPhone:null,
         cusName:null,
-        orgName: null,
+        orgName: self.$store.state.user.orgName,
         orgCode: null,
         remarks: null,
         sumQuantity:null,
@@ -119,7 +121,13 @@ export default {
           controlId: 'invId',
           dataType: self.$config.tableSelectType.inventory,
           fieldUpdate: self.$updateColumns.freezeChooseIvt,
-          searchDetailFlag: true
+          searchDetailFlag: true,
+          // 查询条件
+          otherSearchParam: () => {
+            return {
+              inqtyFlag: true,
+            }
+          },
         },
         {
           field: 'skuName',
@@ -127,7 +135,13 @@ export default {
           controlId: 'invId',
           dataType: self.$config.tableSelectType.inventory,
           fieldUpdate: self.$updateColumns.freezeChooseIvt,
-          searchDetailFlag: true
+          searchDetailFlag: true,
+          // 查询条件
+          otherSearchParam: () => {
+            return {
+              inqtyFlag: true,
+            }
+          },
         },
         {
           field: 'skuCode',
@@ -158,31 +172,16 @@ export default {
             piece: ['freezeQty%packBox', 'freezeQty', 'packBox'],
           },
         },
-        //包装
+        //基本单位
         {
-          field: 'packBox',
+          field: 'unitName',
+          title: self.$t('piece'),
           type: 'disabled',
         },
-        //箱
         {
-          field: 'box',
-          type: 'number',
-          digits: 0,
-          sum: true,
-          formula: {
-            freezeQty: ['box*packBox+piece', 'box', 'packBox','piece'],
-          },
-        },
-        //片
-        {
-          field: 'piece',
-          type: 'number',
-          digits: 0,
-          sum: true,
-          formula: {
-            freezeQty: ['box*packBox+piece', 'piece','box','packBox'],
-            box: ['(box*packBox+piece)%packBox', 'piece', 'box' , 'packBox','packBox'],
-          },
+          field: 'unitInfo',
+          title: self.$t('boxPiece'),
+          type: 'nonStandard',
         },
         //备注
         {
@@ -268,6 +267,21 @@ export default {
 
   methods: {
     /**
+     * @desc   : 修改包装数
+     * @author : 周兴
+     * @date   : 2024/5/24 15:02
+     */
+    changeNonStandard({row,rowIndex,field}){
+      let table = this.$refs['goodsTable'].tableData
+      table[rowIndex][field] = (row['nonStandardForm']['box']?row['nonStandardForm']['box']:0)
+        + row['subUnitName']
+        +(row['nonStandardForm']['piece'] == 0 || row['nonStandardForm']['piece'] ?row['nonStandardForm']['piece']:'')
+        +(row['unitName']?(row['nonStandardForm']['piece']?row['unitName']:''):'')
+      table[rowIndex]['box'] = row['nonStandardForm']['box']?row['nonStandardForm']['box']:0
+      table[rowIndex]['piece'] = row['nonStandardForm']['piece'] ?row['nonStandardForm']['piece']:0
+      table[rowIndex]['freezeQty'] = row['packBox'] * (row['nonStandardForm']['box']?row['nonStandardForm']['box']:0) + (row['nonStandardForm']['piece'] ?row['nonStandardForm']['piece']:0)
+    },
+    /**
      * @desc   : 获取客户相关
      * @author : 宋扬
      * @date   : 2024/3/14 15:05
@@ -316,13 +330,39 @@ export default {
      * @date   : 2024/3/14 16:36
      */
     getTotals(field, row, rowIndex) {
-      let table = this.$refs['goodsTable'].getTableDataFilter();
+      let table = this.$refs['goodsTable'].tableData;
       let sumQuantity = 0;  // 合计数量
       if (table && table.length > 0) {
         table.forEach(row => {
           if (row["freezeQty"]) {
             sumQuantity += parseFloat(row["freezeQty"]);
           }
+          this.decimalPlaces = row['decimalPlaces']
+          if(row['subUnitId']){
+            row.nonStandardForm = {
+              formula: (row['subUnitName']?'1'+row['subUnitName']+ '=':'' ) + row['packBox'] + row['unitName'],
+              box:(row['freezeQty']/row['packBox'] >= 1 ? Math.floor(row['freezeQty']/row['packBox']):0),
+              piece:row['freezeQty']%row['packBox']?row['freezeQty']%row['packBox']:0,
+            }
+            row.nonStandardItems = [
+              {code:'formula',label:'计算公式',type:'text',readonly:true},
+              {code:'box',label:row['subUnitName'],type:'number' },
+              {code:'piece',label:row['unitName'],type:'number',digits:this.decimalPlaces}
+            ]
+            row['unitInfo'] = (row['freezeQty']/row['packBox'] >= 1 ? Math.floor(row['freezeQty']/row['packBox']):0) + row['subUnitName'] + (row['freezeQty']%row['packBox']?row['freezeQty']%row['packBox']:0).toFixed(this.decimalPlaces) + row['unitName']
+          }else{
+            row.nonStandardForm = {
+              formula: (row['subUnitName']?'1'+row['subUnitName']+ '=':'' ) + row['packBox'] + row['unitName'],
+              piece:row['freezeQty'],
+            }
+            row.nonStandardItems = [
+              {code:'formula',label:'计算公式',type:'text',readonly:true},
+              {code:'piece',label:row['unitName'],type:'number',digits: this.decimalPlaces}
+            ]
+            row['unitInfo'] = row['freezeQty'] + row['unitName']
+          }
+          row['box'] = row['nonStandardForm']['box']
+          row['piece'] = row['nonStandardForm']['piece']
         })
         this.formData.sumQuantity = sumQuantity;
       }

src/view/ivt/ivt-transfer/form.vue

@@ -46,7 +46,7 @@
             <InputPop ref="nonStdCode" v-model="formData.nonStdCode"/>
           </DkFormItem>-->
           <!--备注-->
-          <DkFormItem prop="remarks">
+          <DkFormItem prop="remarks" :span="24">
             <InputPop v-model="formData.remarks" textareaFlag/>
           </DkFormItem>
         </DkForm>

src/view/ivt/out-handle/form.vue

@@ -77,7 +77,7 @@
                              type="date" :short-cut-flag="true"/>
             </DkFormItem>
             <!--备注-->
-            <DkFormItem prop="remarks" :span="12">
+            <DkFormItem prop="remarks" :span="24">
               <InputPop ref="remarks" v-model="formData.remarks"
                         maxlength=500 textareaFlag/>
             </DkFormItem>

src/view/mst/basic-data/index.vue

@@ -50,7 +50,7 @@
                    :pageFlag="true"
                    :page-total="pageInfo.total" :current-page="pageInfo.currentPage" :choose-flag="false"
                    :height="this.tableHeight-30" primaryKey="brandId" @pageChange="pageSizeChange">
-            <DkTableColumn field="whCode"></DkTableColumn>
+<!--            <DkTableColumn field="whCode"></DkTableColumn>-->
             <DkTableColumn field="whName"></DkTableColumn>
             <DkTableColumn field="supervisor"></DkTableColumn>
             <DkTableColumn field="contactPhone"></DkTableColumn>
@@ -65,7 +65,7 @@
                    :pageFlag="true"
                    :page-total="pageInfo.total" :current-page="pageInfo.currentPage" :choose-flag="false"
                    :height="this.tableHeight" primaryKey="channelId" @pageChange="pageSizeChange">
-            <DkTableColumn field="channelCode"></DkTableColumn>
+<!--            <DkTableColumn field="channelCode"></DkTableColumn>-->
             <DkTableColumn field="channelName"></DkTableColumn>
             <DkTableColumn field="flgDefault" type="switch"></DkTableColumn>
             <DkTableColumn field="flgValid" type="switch"></DkTableColumn>
@@ -121,8 +121,8 @@
         </DkFormItem>
         <!--备注-->
         <DkFormItem prop="remarks">
-          <InputPop ref="remarks" v-model="formData.remarks"
-                    maxlength=500 textareaFlag/>
+          <InputPop ref="remarks" v-model="formData.remarks" :span="12"
+                    maxlength=500 :textarea-flag="true" />
         </DkFormItem>
       </DkForm>
     </DkModal>
@@ -167,10 +167,10 @@ export default {
       },
       searchContent:
         [
-          {
-            itemCode: 'code',
-            itemName: 'goodsAttrCode'
-          },
+          // {
+          //   itemCode: 'code',
+          //   itemName: 'goodsAttrCode'
+          // },
           {
             itemCode: 'name',
             itemName: 'goodsAttrName'
@@ -198,6 +198,7 @@ export default {
      * @date   : 2024/3/9 10:55
      */
     getData(params) {
+      let name = this.$refs['searchCond'].value._value[this.$refs['searchCond'].searchCond[0].valueFormat.code]
       // 商品品牌
       if (this.kindCode == this.$config.kindCode.basicWarehouse || this.kindCode == null) {
         setTimeout(()=>{
@@ -205,9 +206,7 @@ export default {
         },100)
         this.saleChannelTableFlag = false
         this.dictionaryTableFlag = false
-        console.log("this.leftRow:",this.leftRow)
-        params.whCode = this.leftRow.code
-        params.whName = this.leftRow.name
+        params.whName = name
         this.excute(this.$service.wareHouseService, this.$service.wareHouseService.selectByCond, params).then(res => {
           if (res.code === this.$config.SUCCESS_CODE) {
             this.wareHouseData = res.data.list
@@ -222,8 +221,7 @@ export default {
         }, 100)
         this.wareHouseTableFlag = false
         this.dictionaryTableFlag = false
-        params.channelCode = this.leftRow.code
-        params.channelName = this.leftRow.name
+        params.channelName = name
         this.excute(this.$service.saleChannelService, this.$service.saleChannelService.selectByCond, params).then(res => {
           if (res.code === this.$config.SUCCESS_CODE) {
             this.saleChannelTableData = res.data.list
@@ -233,6 +231,7 @@ export default {
       } else {
         // 数据字典
         params.dictCode = this.kindCode
+        params.dataValue = name
         setTimeout(() => {
           this.dictionaryTableFlag = true
         }, 100)

src/view/mst/customer/detail.vue

@@ -1,12 +1,12 @@
 <!-- @desc:客户管理详情  @auth:付斌  @time:2024/1/30 15:15 -->
 <template>
   <div class="main-div">
-    <Card class="card">
+    <Card class="card" style="width: 100%;">
       <p slot="title">
         {{ $t('customerInfo') }}
       </p>
       <DkRow>
-        <Col span="8">
+        <Col>
           <Icon type="md-person" size="20"/>
           {{ $t('cusName') + '：' }}
           <b>{{ formData.cusName }}</b>
@@ -27,7 +27,7 @@
         </Col>
       </DkRow>
     </Card>
-    <Card class="card">
+    <Card class="card" style="width: 100%;">
       <!--  新结构重写一下    -->
       <div class="order-info">
 
@@ -147,7 +147,7 @@
             <Card>
               <DkTable :pageFlag="true" primaryKey="orderId" :id="'table-'+$options.name" name="table"
                        @pageChange="orderPageSizeChange" :refreshSelect="false" :show-footer="true"
-                       ref="orderTable2" :data="orderList" :height="tableHeight - 140" :choose-flag="false">
+                       ref="orderTable2" :data="orderList" :height="tableHeight - 350" :choose-flag="false">
                 <DkTableColumn field="orderNo" width="200px"></DkTableColumn>
                 <DkTableColumn field="orderTypeName" :title="$t('biznisTypeName')" width="120px"></DkTableColumn>
                 <DkTableColumn field="orderStatusName" :title="$t('orderStatus')" width="120px"></DkTableColumn>
@@ -187,7 +187,7 @@
             <Card>
               <DkTable :pageFlag="true" primaryKey="outId" :id="'table-'+$options.name" name="table"
                        @pageChange="outPageSizeChange" :refreshSelect="false" :show-footer="true"
-                       ref="orderTable1" :data="orderOutList" :height="tableHeight - 140" :choose-flag="false">
+                       ref="orderTable1" :data="orderOutList" :height="tableHeight - 350" :choose-flag="false">
                 <DkTableColumn field="outNo"/>
                 <DkTableColumn field="biznisNo"></DkTableColumn>
                 <DkTableColumn field="cusName"></DkTableColumn>
@@ -218,7 +218,7 @@
             <Card>
               <DkTable :pageFlag="true" primaryKey="outId" :id="'table-'+$options.name" name="table"
                        @pageChange="outReturnPageSizeChange2" :refreshSelect="false" :show-footer="true"
-                       ref="orderTable3" :data="outReturnList" :height="tableHeight - 140" :choose-flag="false">
+                       ref="orderTable3" :data="outReturnList" :height="tableHeight - 350" :choose-flag="false">
                 <DkTableColumn field="outNo"/>
                 <DkTableColumn field="biznisNo"></DkTableColumn>
                 <DkTableColumn field="cusName"></DkTableColumn>
@@ -246,7 +246,7 @@
           <Card>
             <DkTable :id="'table-'+$options.name" ref="table-select" :data="receiptList"
                      :pageFlag=true @pageChange="receiptPageSizeChange"
-                     :height="tableHeight - 140" primaryKey="receiptId"
+                     :height="tableHeight - 350" primaryKey="receiptId"
                      :choose-flag="false"
                      name="table">
               <DkTableColumn field="rpNo" :title="$t('receiptNo')"/>
@@ -271,7 +271,7 @@
           <Card>
             <DkTable :id="'table-'+$options.name" ref="table-select" :data="refundList"
                      :pageFlag=true @pageChange="refundPageSizeChange"
-                     :height="tableHeight - 140" primaryKey="receiptId"
+                     :height="tableHeight - 350" primaryKey="receiptId"
                      name="table" :choose-flag="false">
               <DkTableColumn field="rpNo" :title="$t('receiptNo')"/>
               <DkTableColumn field="biznisNo"/>
@@ -384,7 +384,7 @@ export default {
       //编辑将只读属性改为true
       this.loading = true
       //客户信息
-      this.excuteNoParam(this.$service.customerService, this.$service.customerService.selectById, [this.$route.params.id]).then(res => {
+      this.excuteNoParam(this.$service.customerService, this.$service.customerService.selectById, [this.$route.params.id],false).then(res => {
         if (res.code === 200) {
           // 过滤地址中的undefined
           if (res.data.addressFull) {

src/view/mst/customer/form.vue

@@ -74,7 +74,7 @@
           </DkFormItem>
           <!--备注-->
           <DkFormItem prop="remarks" :span="24">
-            <InputPop v-model="formData.remarks"/>
+            <InputPop v-model="formData.remarks" textareaFlag/>
           </DkFormItem>
         </DkForm>
       </DkPanel>

src/view/mst/goods-attr/index.vue

@@ -332,7 +332,7 @@ export default {
           this.formData.id = rows[0].brandId
           this.formData.goodsAttrName = rows[0].brandName
           this.formData.shortName = rows[0].shortName
-          this.formData.supplierIds = rows[0].supplierIds
+          this.formData.supplierIds = rows[0].supplierIds === "" ? null : rows[0].supplierIds
           this.formData.supplierName = rows[0].supplierNames
           this.formData.remarks = rows[0].remarks
         }

src/view/mst/goods/form.vue

@@ -48,7 +48,7 @@
             <InputPop ref="skuSpec" v-model="formData.skuSpec"/>
           </DkFormItem>
           <!--备注-->
-          <DkFormItem prop="remarks" :span="12">
+          <DkFormItem prop="remarks" :span="24">
             <InputPop ref="remarks" v-model="formData.remarks"
                       maxlength=500 textareaFlag/>
           </DkFormItem>
@@ -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/mst/org/index.vue

@@ -44,6 +44,7 @@
         <DkTableColumn field="orgCode" ></DkTableColumn>
         <DkTableColumn field="orgMac"></DkTableColumn>
         <DkTableColumn field="whName"></DkTableColumn>
+        <DkTableColumn field="flgBusiness" type="switch" ></DkTableColumn>
         <DkTableColumn field="flgValid" type="switch" ></DkTableColumn>
         <DkTableColumn field="remarks" width="auto"></DkTableColumn>
       </DkTable>
@@ -93,6 +94,15 @@
                        @ok="moneyAccountOk($event)"
                        :type="this.$config.MagnifierType.moneyAccount"/>
         </DkFormItem>
+        <!--业务部门标识-->
+        <DkFormItem prop="flgBusiness">
+          <template>
+            <i-switch v-model="formData.flgBusiness">
+              <span slot="open"></span>
+              <span slot="close"></span>
+            </i-switch>
+          </template>
+        </DkFormItem>
         <!--备注-->
         <DkFormItem prop="remarks">
           <InputPop v-model="formData.remarks" textareaFlag/>
@@ -114,6 +124,7 @@ export default {
       formData: {
         orgCode: null,
         orgName: null,
+        levelNo: 1,
         parentId: null,
         levelLeaf: null,
         displayNo: null,
@@ -126,6 +137,8 @@ export default {
         macId:null,
         macCode:null,
         macName:null,
+        flgBusiness:false,
+        levelCode:null,
       },
       // 获取topId值
       topId: null,
@@ -135,6 +148,8 @@ export default {
       editTopFlgValid:null,
       // 父级信息
       parentOrgList:[],
+      // =存原始父级数据
+      parentOrgSocial:[],
       // 查询条件
       searchContent: [
         {
@@ -153,24 +168,39 @@ export default {
     detail(id) {
       return this.excuteNoParam(this.$service.orgService, this.$service.orgService.selectById, [id],false)
     },
-
+    /**
+     * @desc   : 加载基础数据
+     * @author : 姜宁
+     * @date   : 2024/7/30 14:21
+     */
+    initData(type){
+      if(!type){
+        this.getUpperOrg();
+      }
+    },
+    /**
+     * @desc   : 获取上级组织机构
+     * @author : 姜宁
+     * @date   : 2024/7/30 14:21
+     */
+    getUpperOrg(){
+      this.excute(this.$service.commonService, this.$service.commonService.getOrg, {}).then(res => {
+        if (res.code === this.$config.SUCCESS_CODE) {
+          this.parentOrgList = res.data;
+          this.parentOrgSocial = res.data?.copy();
+          // 赋值TopId
+          this.topId=res.data[0].topId;
+        }
+      })
+    },
     /**
      * @desc   : 查询数据
      * @author : 宋扬
      * @date   : 2024/3/8 15:43
      */
     getData(params) {
-      let excute =  this.excute(this.$service.orgService, this.$service.orgService.selectByCond, params)
-      excute.then(res=>{
-        if (res.code === this.$config.SUCCESS_CODE) {
-         this.parentOrgList=res.data.list;
-         // 赋值TopId
-          this.topId=res.data.list[0].topId;
-        }
-      })
-      return excute
+      return this.excute(this.$service.orgService, this.$service.orgService.selectByCond, params);
     },
-
     /**
      * @desc   : 保存数据
      * @author : 付斌
@@ -183,7 +213,6 @@ export default {
         return this.excute(this.$service.orgService, this.$service.orgService.update, this.params)
       }
     },
-
     /**
      * @desc   : 仓库赋值
      * @author : 宋扬
@@ -209,7 +238,17 @@ export default {
         }
       }
     },
-
+    /**
+     * @desc   : 编辑时获取业务部门下拉数据源
+     * @author : 姜宁
+     * @date   : 2024/7/30 13:50
+     */
+    setValuesByEdit(){
+      this.$nextTick(()=>{
+        this.parentOrgList = this.parentOrgSocial.filter(item=>item.levelCode.indexOf(this.formData.levelCode) === -1)
+        console.log("parentOrgList",this.parentOrgList)
+      })
+    },
     /**
      * @desc   : 资金账户
      * @author : 宋扬
@@ -243,7 +282,9 @@ export default {
      */
     currentChangeEvent({row}) {
       if (row != null) {
-        this.formData.parentId = row.orgId;
+        if (this.modalParams.button === this.$config.formMode.add){
+          this.formData.parentId = row.orgId;
+        }
         // 判断是否是底层数据
         this.flgValid = row.levelLeaf;
         if(row.parentId==null){
@@ -260,6 +301,7 @@ export default {
     this.primaryKey = 'orgId'  // 设置主键Id
     this.routeObjName = 'org'  // 设置路由名称
     this.comHandleEnableFlag = true;
+    this.pageFlag = false
   }
 }
 </script>

src/view/mst/staff/index.vue

@@ -543,7 +543,6 @@ export default {
      * @date   : 2024/3/5 14:19
      */
     saveData() {
-      console.log("this.params:",this.params)
       if (this.modalParams.button === this.$config.formMode.add) {
         delete this.params.staffId // 解决提示主键重复的问题，删除主键代码
         return this.excute(this.$service.staffService, this.$service.staffService.insert, this.params)

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

@@ -53,15 +53,15 @@
           <DkFormItem prop="contactPhone" :label="$t('contactPhone')">
             <InputPop :telephone="true" ref="contactPhone" :readonly="true" v-model="formData.contactPhone"/>
           </DkFormItem>
-          <!--备注-->
-          <DkFormItem prop="remarks">
-            <InputPop ref="remarks" v-model="formData.remarks"
-                      maxlength=500 textareaFlag/>
-          </DkFormItem>
           <!--开单并入库办理标识-->
           <DkFormItem prop="inboundProcessingFlag" >
             <dkSwitch ref="inboundProcessingFlag" v-model="formData.inboundProcessingFlag"/>
           </DkFormItem>
+          <!--备注-->
+          <DkFormItem prop="remarks" :span="24">
+            <InputPop ref="remarks" v-model="formData.remarks"
+                      maxlength=500 textareaFlag/>
+          </DkFormItem>
         </DkForm>
       </DkPanel>
       <!--商品信息-->
@@ -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-enter/form.vue

@@ -73,7 +73,7 @@
                            type="date" :short-cut-flag="true"/>
           </DkFormItem>
           <!--备注-->
-          <DkFormItem prop="remarks" :span="12">
+          <DkFormItem prop="remarks" :span="24">
             <InputPop ref="remarks" v-model="formData.remarks"
                       maxlength=500 textareaFlag/>
           </DkFormItem>

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

@@ -54,7 +54,7 @@
             <InputPop :telephone="true" ref="contactPhone" :readonly="true" v-model="formData.contactPhone"/>
           </DkFormItem>
           <!--备注-->
-          <DkFormItem prop="remarks">
+          <DkFormItem prop="remarks" :span="24">
             <InputPop ref="remarks" v-model="formData.remarks"
                       maxlength=500 textareaFlag/>
           </DkFormItem>
@@ -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,12 +329,13 @@ export default {
         //   },
         // },
         {
-          field: 'unitInfo',
+          field: 'packBox',
           title: self.$t('boxPiece'),
-          type: 'nonStandard',
+          type: 'disabled',
         },
         {
           field: 'remarks',
+          type: 'text',
         },
       ],
       warehouseList: [],//仓库
@@ -382,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);
@@ -394,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'],
@@ -443,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;
@@ -499,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']
         })
@@ -521,6 +521,8 @@ export default {
         this.formData.fromNos = fromNos
         this.formData.fromIds = fromIds
         this.chooseFlag = false
+        //计算合计
+        this.getTotale(this.purchaseItemList)
       }
     },
 
@@ -665,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
         // 还款金额
@@ -676,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
         // 商品总数量
@@ -688,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
         // 还款金额
@@ -718,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)
         // 标价
@@ -747,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)
@@ -824,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
@@ -874,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'

src/view/sale/cus-receipt/form.vue

@@ -39,7 +39,7 @@
             <InputNumberPop ref="receivableBalance" v-model="formData.receivableBalance" :disabled="true"/>
           </DkFormItem>
           <!--备注-->
-          <DkFormItem prop="remarks" :span="12">
+          <DkFormItem prop="remarks" :span="24">
             <InputPop ref="remarks" v-model="formData.remarks"
                       maxlength=500 textareaFlag/>
           </DkFormItem>

src/view/sale/order-out/form.vue

@@ -119,7 +119,7 @@
 <!--                           @ok="selectFromNoList"/>-->
 <!--        </DkFormItem>-->
           <!--单据备注-->
-          <DkFormItem prop="remarks" :span="12">
+          <DkFormItem prop="remarks" :span="24">
             <InputPop ref="remarks" v-model="formData.remarks"
                       maxlength=500 textareaFlag/>
           </DkFormItem>

src/view/sale/order-return/form.vue

@@ -110,7 +110,7 @@
             </template>
           </DkFormItem>
           <!--单据备注-->
-          <DkFormItem prop="remarks" :span="12">
+          <DkFormItem prop="remarks" :span="24">
             <InputPop ref="remarks" v-model="formData.remarks" :readonly="checkColumnIsEdit('remarks')"
                       maxlength=500 textareaFlag/>
           </DkFormItem>

src/view/sale/order-return/index.vue

@@ -9,6 +9,8 @@
         <BaseIndexButton ref="entryHandle" name="entryHandle"></BaseIndexButton>
         <BaseIndexButton ref="entryBack" name="entryBack"></BaseIndexButton>
         <BaseIndexButton ref="invalid" name="invalid"></BaseIndexButton>
+        <!--打印-->
+        <BaseIndexButton ref="print" name="print"></BaseIndexButton>
       </template>
       <template #right>
         <BaseIndexButton ref="add" name="add"></BaseIndexButton>
@@ -43,20 +45,20 @@
                    :page-size-opts="pageSizeOpts"
                    :page-size="pageInfo.pageSize"
                    name="table">
-            <DkTableColumn field="outNo" :type="$libaray.checkButtonHasRight('order-return-edit')?'link':''"
+            <DkTableColumn field="outNo" :title="$t('returnNo')" :type="$libaray.checkButtonHasRight('order-return-edit')?'link':''"
                            @on-link="handleLink"/>
+            <DkTableColumn field="outDate" :title="$t('intoDate')" data-type="date"></DkTableColumn>
+            <DkTableColumn field="outStatusName" :title="$t('intoStatus')" :color-cards="['待出库','出库中','已出库']"></DkTableColumn>
             <DkTableColumn field="biznisNo"></DkTableColumn>
             <DkTableColumn field="cusName" :type="$libaray.checkButtonHasRight('customer-detail')?'link':''"
                            @on-link="openCustomerMessage"></DkTableColumn>
             <DkTableColumn field="cusPhone"></DkTableColumn>
             <DkTableColumn field="contactName"></DkTableColumn>
             <DkTableColumn field="addressFull"></DkTableColumn>
-            <DkTableColumn field="outingQty" dataType="number" sum></DkTableColumn>
-            <DkTableColumn field="outingAmt" :digits="2" dataType="number" sum></DkTableColumn>
-            <DkTableColumn field="outQty" dataType="number" sum></DkTableColumn>
-            <DkTableColumn field="outAmt" :digits="2" dataType="number" sum></DkTableColumn>
-            <DkTableColumn field="outDate" data-type="date"></DkTableColumn>
-            <DkTableColumn field="outStatusName" :color-cards="['待出库','出库中','已出库']"></DkTableColumn>
+            <DkTableColumn field="outingQty" :title="$t('intoingQty')" dataType="number" sum></DkTableColumn>
+            <DkTableColumn field="outingAmt" :title="$t('intoingAmt')" :digits="2" dataType="number" sum></DkTableColumn>
+            <DkTableColumn field="outQty" :title="$t('intoQty')" dataType="number" sum></DkTableColumn>
+            <DkTableColumn field="outAmt" :title="$t('intoAmt')" :digits="2" dataType="number" sum></DkTableColumn>
             <DkTableColumn field="orgName"></DkTableColumn>
             <DkTableColumn field="staffName"></DkTableColumn>
             <DkTableColumn field="makeTime" :dataType="$config.columnType.dateTime"></DkTableColumn>
@@ -76,14 +78,12 @@
               <DkTableColumn field="skuModel"></DkTableColumn>
               <DkTableColumn field="skuName"></DkTableColumn>
               <DkTableColumn field="skuCode"></DkTableColumn>
-              <DkTableColumn field="outStatusName"></DkTableColumn>
-              <DkTableColumn field="outingQty" dataType="number" sum></DkTableColumn>
-              <DkTableColumn field="outingAmt" :digits="2" dataType="number" sum></DkTableColumn>
-              <DkTableColumn field="outQty" dataType="number" sum></DkTableColumn>
-              <DkTableColumn field="outAmt" :digits="2" dataType="number" sum></DkTableColumn>
-              <DkTableColumn field="returnQty" dataType="number" sum></DkTableColumn>
-              <DkTableColumn field="returnAmt" :digits="2" dataType="number" sum></DkTableColumn>
-              <DkTableColumn field="priceOut"></DkTableColumn>
+              <DkTableColumn field="outStatusName" :title="$t('intoStatus')"></DkTableColumn>
+              <DkTableColumn field="outingQty" :title="$t('intoingQty')" dataType="number" sum></DkTableColumn>
+              <DkTableColumn field="outingAmt" :title="$t('intoingAmt')" :digits="2" dataType="number" sum></DkTableColumn>
+              <DkTableColumn field="outQty" :title="$t('intoQty')" dataType="number" sum></DkTableColumn>
+              <DkTableColumn field="outAmt" :title="$t('intoAmt')" :digits="2" dataType="number" sum></DkTableColumn>
+              <DkTableColumn field="priceOut" :title="$t('intoItemPrice')"></DkTableColumn>
               <DkTableColumn field="whName"></DkTableColumn>
               <DkTableColumn field="nonStdCode"></DkTableColumn>
               <DkTableColumn field="remarks"></DkTableColumn>
@@ -100,16 +100,21 @@
         </div>
       </DkSplit>
     </div>
+    <PrintModal ref="printModal" :doc-name="$config.docCode.return"
+                :postName="'order_out'"
+                :id="$refs?.['table-select']?.batchRows?.[0]?.outId||null"/>
   </div>
 </template>
 
 <script>
 
-import {indexMixin} from '@/mixins'
+import {indexMixin} from '@/mixins';
+import PrintModal from '_c/business/print/modal';
 
 export default {
   name: 'order-return',
   mixins: [indexMixin],
+  components: {PrintModal},
   data() {
     let self = this
     return {
@@ -205,6 +210,15 @@ export default {
   },
   methods: {
     /**
+     * @desc   : 选择模板、打印机
+     * @author : 洪旭东
+     * @date   : 2023-04-10 13:45
+     */
+    print() {
+      this.$refs.printModal.showChooseTemplate = true
+    },
+
+    /**
      * @desc   : 进入客户页面
      * @author : 常皓宁
      * @date   : 2024/5/21 11:05

src/view/sale/order/form.vue

@@ -108,7 +108,7 @@
             <DkSwitch prop="outboundProcessingFlag" v-model="formData.outboundProcessingFlag" :readonly="type === $config.formMode.edit" ref="outboundProcessingFlag"></DkSwitch>
           </DkFormItem>
           <!--备注-->
-          <DkFormItem prop="remarks" :span="18">
+          <DkFormItem prop="remarks" :span="24">
             <InputPop ref="remarks" v-model="formData.remarks"
                       maxlength=500 textareaFlag/>
           </DkFormItem>