销售订单

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

@@ -26,9 +26,9 @@
             <InputPop ref="cusName" :disabled="true" v-model="formData.cusName"/>
           </DkFormItem>
           <!--客户区域-->
-          <DkFormItem prop="addressArea">
-            <RegionsChoose v-model="regionData" :options="cityData" :default-value="formData.addressArea"
-                           :readonly="true" ref="customerDistrict" :disabled="true"></RegionsChoose>
+          <DkFormItem prop="addressName" :required="true">
+            <RegionsChoose v-model="addressArea" :options="cityData" :default-value="formData.addressName"
+                           ref="customerDistrict" :disabled="true"></RegionsChoose>
           </DkFormItem>
           <!--门牌号-->
           <DkFormItem prop="addressNo">
@@ -47,7 +47,6 @@
           <DkFormItem prop="orgId" :label="$t('orgId')">
             <SelectMagnifier v-model="formData.orgId" :display-text="formData.orgName"
                              :type="this.$config.MagnifierType.org"
-                             @ok="orgOk"
                              :initSearchFlag="true"
                              :multiple="false" :disabled="true"/>
           </DkFormItem>
@@ -55,7 +54,6 @@
           <DkFormItem prop="staffId" :label="$t('staffId')">
             <SelectMagnifier v-model="formData.staffId" :display-text="formData.staffName"
                              :type="this.$config.MagnifierType.staff"
-                             @ok="staffOk"
                              :initSearchFlag="true"
                              :multiple="false" :disabled="true"/>
           </DkFormItem>
@@ -76,7 +74,7 @@
                        valueKey="channelId" :disabled="true">
             </SelectPop>
           </DkFormItem>
-          <!--送货时间-->
+          <!--出库日期-->
           <DkFormItem prop="outDate" :data-type="$config.dataType.date">
             <DatePickerPop v-model="formData.outDate"
                            :short-cut-flag="true"/>
@@ -91,22 +89,22 @@
       <!--商品信息-->
       <DkPanel prop="goodsInformation">
         <div id="search-cond-div-goods-info" ref="search-cond-div-goods-info" slot="content">
-          <EditTable ref="goodsTable" :data="formData.goodsList" showFooter
-                     combined-field="promotionId"
-                     name="table"
-                     :operate-flag="true"
-                     :addFlag="false"
-                     :readonly="this.type === this.$config.formMode.handle"
-                     :columns="goodsColumns" controlId="skuId"
-                     :new-row-flag="false"
+          <EditTable ref="goodsTable" :data="formData.orderItemList" showFooter
+                     major-field="itemId"
+                     :readonly="checkColumnIsEdit('goodsTable')"
+                     :columns="addOutItemColumns"
+                     controlId="invId"
                      @on-choose="getTotals"
-                     @changeValue="changeValue"
-                     @currentChangeGetData="currentChangeGetData"
-                     @delRow="delItem"
+                     @changeValue="getTotals"
           ></EditTable>
           <div>
             <DkForm ref="goodsFootFormData" v-model="goodsFootFormData" :labelMaxWords="4" name="dk-form"
                     class="form-content-class">
+              <!--合计数量-->
+              <DkFormItem prop="sumQuantity">
+                <InputNumberPop ref="sumQuantity" v-model="goodsFootFormData.sumQuantity" :clearable="false"
+                                :digits="2" :readonly="true"/>
+              </DkFormItem>
               <!--货物金额-->
               <DkFormItem prop="sumAmount">
                 <InputNumberPop ref="sumAmount" v-model="goodsFootFormData.sumAmount" :readonly="true"
@@ -133,86 +131,8 @@
         </div>
       </DkPanel>
     </DkCollapse>
-    <!--下部分按钮区域   -->
-    <DkSaveButton ref="saveButton" :loading="loading" :showQuotation=true :disabled="allCanNoEdit" @save="submitForm"
-                  @close="closeForm"></DkSaveButton>
-    <!--查询库存-->
-    <DkModal
-      v-model="invModel"
-      :title="$t('select-ivt')"
-      width="1200px"
-      height="1200"
-      :loading="loading"
-      :okVisibleFlag="true"
-      :cancelVisibleFlag="true"
-      @modalOk="ivtHandleOk"
-      @modalCancel="ivtHandleCancel"
-      @on-visible-change="onVisibleChange"
-    >
-      <BaseIndexButtonGroup id="BaseIndexButtonGroup">
-        <template #left>
-          <!--查询-->
-          <BaseIndexButton ref="search" name="search" @click="searchInventory()"></BaseIndexButton>
-          <!--清空条件-->
-          <BaseIndexButton :finalFlag="true" ref="clear" name="clear" @click="searchCondClear"></BaseIndexButton>
-        </template>
-      </BaseIndexButtonGroup>
-
-      <div style="width: 100%;height: 10px"></div>
-      <DkTabs ref="tabs" :options="ivtTabsOptions" @on-click="tabsClick" @on-clear="clearSelected"></DkTabs>
-      <!--查询列表-->
-      <DkTable v-show="tabIndex === 0" ref="inventoryTable"
-               primaryKey="ivtId"
-               :id="'table-inventory-select'"
-               name="inventoryTable"
-               :data="inventoryData"
-               :height="400"
-               :showCheckboxHeader="false"
-               :selectFlag="false"
-               @pageChange="pageSizeChange"
-               @select-change="addSelectedTable"
-               @select-all="selectAll"
-      >
-        <DkTableColumn class-name="fixed-left" type="checkbox" fixed="left"></DkTableColumn>
-        <DkTableColumn field="skuModel"></DkTableColumn>
-        <DkTableColumn field="skuName"></DkTableColumn>
-        <DkTableColumn field="skuCode"></DkTableColumn>
-        <DkTableColumn field="whName"></DkTableColumn>
-        <DkTableColumn field="nonStdCode"></DkTableColumn>
-        <DkTableColumn field="unitName"></DkTableColumn>
-        <!--库存数量-->
-        <DkTableColumn field="ivtQty"></DkTableColumn>
-        <!--可售量-->
-        <DkTableColumn field="usableQty"></DkTableColumn>
-      </DkTable>
-      <!--已选列表-->
-      <div v-show="tabIndex === 1">
-        <DkTable :primaryKey="ivtId" ref="table-selected"
-                 :id="'table-inventory-selected'"
-                 name="selectedTable"
-                 :data="selectedTable"
-                 :height="430"
-                 :selectFlag="false"
-                 :operateFlag="true"
-                 :tree-flag="false"
-                 :lazy="false"
-                 :pageTotalFlag="false"
-                 :pageFlag="false"
-        >
-          <DkTableColumn field="skuModel"></DkTableColumn>
-          <DkTableColumn field="skuName"></DkTableColumn>
-          <DkTableColumn field="skuCode"></DkTableColumn>
-          <DkTableColumn field="whName"></DkTableColumn>
-          <DkTableColumn field="nonStdCode"></DkTableColumn>
-          <DkTableColumn field="unitName"></DkTableColumn>
-          <!--库存数量-->
-          <DkTableColumn field="ivtQty"></DkTableColumn>
-          <!--可售量-->
-          <DkTableColumn field="usableQty"></DkTableColumn>
-        </DkTable>
-      </div>
-      <div slot="footer"/>
-    </DkModal>
+    <!--      下部分按钮区域-->
+    <DkSaveButton ref="saveButton" :loading="loading" @save="save(true)" @close="close"/>
   </div>
 </template>
 
@@ -231,13 +151,15 @@ export default {
       allCanNoEdit: false, //是否所有的都不允许编辑
       // 画面表单数据
       formData: {
-        outId: null,
-        //大编辑标识
-        allEdit: false,
         //所属公司
         cpId: this.$store.state.user.cpId,
-        editTime: null,
-        orderStatus: null,//订单状态
+        outId: null,
+        out_no: null,
+        out_type: null,
+        from_id: null,
+        from_no: null,
+        order_id: null,
+        order_no: null,
         cusId: null,//客户Id
         cusName: null,
         cusPhone: null,
@@ -255,60 +177,34 @@ export default {
         orgId: null,
         orgName: null,
         orgCode: null,
-        channelId: null, //销售渠道
+        salesChannel: null, //销售渠道
         cusFrom: null,//客户来源
         remarks: null,
-        goodsList: [],
-        goodsSocial: [],//记录列表的原始数据
-        //出库明细
-        orderOutItemVOList: [],
-        //删除出库明细
-        orderOutItemDeleteList: [],
+        outItemList: [],
+        deleteItemList: [],
         //出库状态(默认为出库中)
-        outStatus: 2,
-        //办理人
-        doneUser: this.$store.state.user.id,
-        //办理时间
-        doneTime: new Date().format("yyyy-MM-dd hh:mm:ss"),
-        //制单人
-        makingUser: this.$store.state.user.id,
-        //制单时间
-        makingTime: new Date().format("yyyy-MM-dd hh:mm:ss"),
-        //允许操作标识
-        flgAllowTodone: true,
-        //允许冲正标识
-        flgAllowReverse: true,
+        outStatus: this.$config.outStatus.chuKuZhong,
+        makeStaff: self.$store.state.user.id,
+        outDate: new Date(),//出库时间
         // 订单附件
         orderAnnexPaths: [],
-        files: [],
         // 附件
-        annexPaths: [],
+        annexPaths: null,
+        files: [],
       },
-      regionData: [],
+      addressArea: [],
       cityData: [],
       channelList: [],
-      cusFromList: [],//客户来源
-      goodsColumns: [
-        //商品型号
+      cusFromList: [],
+      addOutItemColumns: [
         {
           field: 'skuModel',
-          controlId: 'skuId',
-          treeNode: true,
           type: 'disabled',
-          promotionType: true,
-          disabled: true,
-          searchDetailFlag: false
         },
-        //商品名称
         {
           field: 'skuName',
-          controlId: 'skuId',
           type: 'disabled',
-          promotionType: true,
-          disabled: true,
-          searchDetailFlag: false
         },
-        //唯一编码
         {
           field: 'skuCode',
           type: 'disabled',
@@ -329,26 +225,24 @@ export default {
         },
         {
           field: 'whName',
-          type: self.isEditColumns ? 'disabled' : 'tableSelect',
+          type: 'tableSelect',
           multiple: false,
           sortBoolean: false,
-          dataType: self.$config.tableSelectType.entryOtherInventory,
+          dataType: self.$config.tableSelectType.inventory,
           param: () => {
             return {skuCode: this.ivtSkuCode}
           },
           fieldUpdate: [
-            {updateField: 'nonStandardCode', valueFiled: 'nonStandardCode'},//非标号
-            {updateField: 'ivtQty', valueFiled: 'ivtQty'},
+            {updateField: 'nonStdCode', valueFiled: 'nonStdCode'},
+            {updateField: 'invQty', valueFiled: 'invQty'},
             {updateField: 'usableQty', valueFiled: 'usableQty'},
             {updateField: 'remarks', valueFiled: 'remarks'},
-            {updateField: 'skuWeight', valueFiled: 'skuWeight'},
-            {updateField: 'skuVolume', valueFiled: 'skuVolume'},
-            {updateField: 'ivtId', valueFiled: 'ivtId'},
+            {updateField: 'invId', valueFiled: 'invId'},
             {updateField: 'skuId', valueFiled: 'skuId'},
             {updateField: 'whId', valueFiled: 'whId'},
             {updateField: 'whName', valueFiled: 'whName'},
           ],
-          searchDetailFlag: false
+          searchDetailFlag: true
         },
         //出库数量
         {
@@ -361,16 +255,16 @@ export default {
             outingAmt: ['outingQty*priceSale', 'outingQty', 'priceSale'],
           }
         },
-        // //库存量
-        // {
-        //   field: 'ivtQty',
-        //   type: 'disabled',
-        // },
-        // //可售量
-        // {
-        //   field: 'usableQty',
-        //   type: 'disabled',
-        // },
+        //库存量
+        {
+          field: 'invQty',
+          type: 'disabled',
+        },
+        //可售量
+        {
+          field: 'usableQty',
+          type: 'disabled',
+        },
         //单价
         {
           field: 'priceSale',
@@ -386,90 +280,85 @@ export default {
           digits: 0,
           sum: true
         },
+        //非标号
+        {
+          field: 'nonStdCode', type: 'disabled', equal: true,
+        },
         //备注
         {field: 'remarks'},
       ],
       //商品合计信息
       goodsFootFormData: {
+        sumQuantity: 0,
         sumAmount: 0,
       },
-      //库存使用
-      ivtTabsOptions: [
-        {label: '选择列表', name: 'name1', index: 0},
-        {label: '已选列表', name: 'name2', index: 1, clear: true},
-      ],
-      //查询库存是选中的唯一编码
-      ivtSkuCode: null,
-      //库存主键
-      ivtId: null,
-      // 查询库存
-      invModel: false,
-      //库存数据
-      inventoryData: [],
-      //已选列表
-      selectedTable: [],
     }
   },
   methods: {
     /**
-     * @desc   : 删除
+     * @desc   : 加载数据
      * @author : 付斌
-     * @date   : 2022/6/27 13:21
+     * @date   : 2024-02-20 15:53
      */
-    delItem(rowIndex) {
-
+    initData() {
+      //获取渠道
+      this.getChannel()
+      //获取数据字典
+      this.getDictionaryData()
     },
-
     /**
-     * @desc   : desc
+     * @desc   : 获取渠道
      * @author : 付斌
-     * @date   : 2022/6/23 8:48
+     * @date   : 2024-03-02 10:15
      */
-    changeValue(field, row, rowIndex) {
-
+    getChannel() {
+      let params = {
+        cpId: this.$store.state.user.cpId
+      }
+      this.excute(this.$service.commonService, this.$service.commonService.getChannel, params, false).then(res => {
+        if (res.code === this.$config.SUCCESS_CODE) {
+          this.channelList = res.data
+        }
+      })
     },
     /**
-     * @desc   : 点击行执行事件
+     * @desc   : 获取数据字典
      * @author : 付斌
-     * @date   : 2023/11/29 17:18
+     * @date   : 2024-03-02 11:15
      */
-    currentChangeGetData(e) {
+    getDictionaryData() {
+      let params = {
+        cpId: this.$store.state.user.cpId,
+        dictCode: this.$config.dictCode.cusFrom,
+      }
+      this.excute(this.$service.commonService, this.$service.commonService.getDictionaryData, params, false).then(res => {
+        if (res.code === this.$config.SUCCESS_CODE) {
+          this.cusFromList = res.data
+        }
+      })
     },
-
     /**
      *   @desc   : 获取商品表格中数量、金额后计算总单信息
      *   @date   : 2022/5/30 15:31
      *   @author : 付斌
      */
     getTotals(field, row, rowIndex) {
-
-    },
-
-    /**
-     * @desc   : 关闭窗体
-     * @author : 付斌
-     * @date   : 2022/6/21 19:18
-     */
-    closeForm() {
-
-    },
-    /**
-     * @desc   : 提交事件
-     * @author : 付斌
-     * @date   : 2022/03/04 13:17
-     */
-    submitForm(value) {
-
+      let table = this.$refs['goodsTable'].getTableDataFilter();
+      let sumQuantity = 0;  // 合计数量
+      let sumAmount = 0;    // 货物金额
+      if (table && table.length > 0) {
+        table.forEach(row => {
+          if (row["itemQty"]) {
+            sumQuantity += parseFloat(row["itemQty"]);
+          }
+          if (row["itemAmt"]) {
+            sumAmount += parseFloat(row["itemAmt"]);
+          }
+        })
+        this.goodsFootFormData.sumQuantity = sumQuantity;
+        this.goodsFootFormData.sumAmount = sumAmount;
+      }
     },
-
-    /***************************列表及其他事件************************************/
-
-
-    /***************************设定参数函数************************************/
-
-
-    /***************************created调用数据接口函数************************************/
-
     /**
      * @desc   : 通过id查询
      * @author : 付斌
@@ -495,129 +384,57 @@ export default {
       }
     },
     /**
-     * @desc   : 判断列是否可以编辑
-     * @author : 付斌
-     * @date   : 2022/6/21 16:42
-     */
-    checkColumnIsEdit(field) {
-
-    },
-    /**
-     * @desc   : 自动出库库标识变更
+     * @desc   : 给参数赋值
      * @author : 付斌
-     * @date   : 2023/10/20 15:24
+     * @date   : 2023/6/25 14:31
      */
-    changeFlgAutoIvt() {
-
-    },
-    /**
-     *   @desc   : 获取业务员相关
-     *   @date   : 2022/5/28 10:43
-     *   @author : 付斌
-     */
-    staffOk(val) {
-
-    },
-    /**
-     *   @desc   : 获取业务员相关
-     *   @date   : 2022/5/28 10:43
-     *   @author : 付斌
-     */
-    orgOk(val) {
-
-    },
-
-    //region 库存页面使用
-    /**
-     * @desc   : 查询库存
-     * @author : 付斌
-     * @date   : 2023/09/08 9:55
-     */
-    searchInventory() {
-
-    },
-
-    /**
-     * @desc   : 切换tab(库存页面)
-     * @author : 付斌
-     * @date   : 2023/09/11 13:11
-     */
-    tabsClick(e, option) {
-
-    },
-
-    /**
-     * @desc   : 删除已选
-     * @author : 付斌
-     * @date   : 2023/9/11 15:04
-     */
-    clearSelected() {
-
-    },
-
-    /**
-     * @desc   : 分页
-     * @author : 付斌
-     * @date   : 2023/9/01 16:26
-     */
-    pageSizeChange(pageInfo) {
-
-    },
-
-    /**
-     * @desc   : 选择库存数据触发
-     * @author : 付斌
-     * @date   : 2023/09/11 11:48
-     */
-    addSelectedTable(batchRows, row, checked, allFlag) {
-
+    setParams(arg) {
+      if (this.type === this.$config.formMode.add) {
+        let orderItemTable = this.$refs['goodsTable'].getTableDataFilter();
+        if (!orderItemTable || orderItemTable.length == 0) {
+          this.$Message.warning(this.$t('W_012'))
+          return;
+        }
+        this.formData.orderItemList = orderItemTable;
+      } else if (this.type === this.$config.formMode.edit) {
+        // 删除的表数据
+        let deleteItemTable = this.$refs['goodsTable'].getDeleteData();
+        this.formData.deleteItemList = deleteItemTable
+
+        // 修改的表数据 和 新增的表数据
+        // let changeItemTable = this.$refs['goodsTable'].getTableChangeData();
+        let changeItemTable = this.$refs['goodsTable'].getTableDataFilter();
+        changeItemTable.forEach((it, index) => {
+          this.$set(it, 'itemIndex', index + 1);
+        });
+        this.formData.orderItemList = changeItemTable
+      }
+      Object.assign(this.params, this.formData, this.goodsFootFormData)
+      this.params.deliveryDate = new Date(this.formData.deliveryDate).toDateStr();
+      // console.log('this.params',this.params)
     },
-
     /**
-     * @desc   : 全选,全不选
+     * @desc   : 保存数据
      * @author : 付斌
-     * @date   : 2023/09/13 10:04
+     * @date   : 2023/6/25 14:31
      */
-    selectAll(checked) {
-
+    saveData() {
+      if (this.type === this.$config.formMode.add) {
+        return this.excute(this.$service.orderService, this.$service.orderService.insertOrder, this.params);
+      } else {
+        return this.excute(this.$service.orderService, this.$service.orderService.updateOrder, this.params)
+      }
     },
 
-    /**
-     * @desc   : 确定选择库存
-     * @author : 付斌
-     * @date   : 2023/09/11 13:26
-     */
-    ivtHandleOk() {
-
-    },
 
     /**
-     * @desc   : 取消选择
-     * @author : 付斌
-     * @date   : 2023/09/11 13:30
-     */
-    ivtHandleCancel() {
-
-    },
-
-    /**
-     * @desc   : 点击X关闭选择窗体时触发事件
+     * @desc   : 判断列是否可以编辑
      * @author : 付斌
-     * @date   : 2023/09/13 9:21
+     * @date   : 2022/6/21 16:42
      */
-    onVisibleChange(e) {
+    checkColumnIsEdit(field) {
 
     },
-
-    /**
-     * @desc   : 清空查询条件
-     * @author : 付斌
-     * @date   : 2023/09/12 16:24
-     */
-    searchCondClear() {
-
-    }
-    //endregion
   },
 
   /**

src/view/sale/order/form.vue

@@ -185,8 +185,6 @@ export default {
   data() {
     let self = this
     return {
-      //新增省市区
-      addressArea: [],
       setCustomerFlag: false,  // 是否是选择客户设置以及编辑时设置
       loading: false,
       //控制客户是否可以输入
@@ -242,9 +240,10 @@ export default {
         remarks: null,
         annexPaths: null,
       },
+      addressArea: [],
       cityData: [],
       channelList: [],
-      cusFromList: [],//客户来源
+      cusFromList: [],
       addOrderItemColumns: [
         {
           field: 'skuModel',
@@ -265,6 +264,11 @@ export default {
           searchDetailFlag: true
         },
         {
+          field: 'skuCode',
+          type: 'disabled',
+        },
+        //价格
+        {
           field: 'priceSale',
           type: 'number',
           digits: 2,
@@ -273,7 +277,8 @@ export default {
             amtStd: ['itemQty*priceStd', 'itemQty', 'priceStd'],
             priceDiscount: ['priceSale/priceStd*100', 'priceSale', 'priceStd'],
           },
-        },//价格(子级放在前面，不然replace就不对)
+        },
+        //数量
         {
           field: 'itemQty',
           type: 'number',
@@ -284,7 +289,8 @@ export default {
             amtStd: ['itemQty*priceStd', 'itemQty', 'priceStd'],
             priceDiscount: ['priceSale/priceStd*100', 'priceSale', 'priceStd'],
           },
-        },//数量
+        },
+        //金额
         {
           field: 'itemAmt',
           type: 'number',
@@ -295,22 +301,25 @@ export default {
             priceSale: ['itemAmt/itemQty', 'itemAmt', 'itemQty'],
             priceDiscount: ['itemAmt/itemQty/priceStd*100', 'itemAmt', 'itemQty', 'priceStd'],
           },
-        },//金额
+        },
+        //商品标价
         {
           field: 'priceStd',
           type: 'disabled',
           number: true,
           digits: 2,
-        },//商品标价
+        },
+        //标价折扣
         {
           field: 'priceDiscount',
           type: 'disabled',
           number: true,
           digits: 2,
-        },//标价折扣
+        },
+        //非标号
         {
           field: 'nonStdCode', type: 'text', equal: true,
-        },//非标号
+        },
         {
           field: 'remarks', type: 'text', equal: true,
         },
@@ -335,6 +344,11 @@ export default {
           searchDetailFlag: true
         },
         {
+          field: 'skuCode',
+          type: 'disabled',
+        },
+        //价格
+        {
           field: 'priceSale',
           type: 'number',
           digits: 2,
@@ -343,7 +357,8 @@ export default {
             amtStd: ['itemQty*priceStd', 'itemQty', 'priceStd'],
             priceDiscount: ['priceSale/priceStd*100', 'priceSale', 'priceStd'],
           },
-        },//价格(子级放在前面，不然replace就不对)
+        },
+        //数量
         {
           field: 'itemQty',
           type: 'number',
@@ -354,7 +369,8 @@ export default {
             amtStd: ['itemQty*priceStd', 'itemQty', 'priceStd'],
             priceDiscount: ['priceSale/priceStd*100', 'priceSale', 'priceStd'],
           },
-        },//数量
+        },
+        //金额
         {
           field: 'itemAmt',
           type: 'number',
@@ -365,40 +381,46 @@ export default {
             priceSale: ['itemAmt/itemQty', 'itemAmt', 'itemQty'],
             priceDiscount: ['itemAmt/itemQty/priceStd*100', 'itemAmt', 'itemQty', 'priceStd'],
           },
-        },//金额
+        },
+        //商品标价
         {
           field: 'priceStd',
           type: 'disabled',
           number: true,
           digits: 2,
-        },//商品标价
+        },
+        //标价折扣
         {
           field: 'priceDiscount',
           type: 'disabled',
           number: true,
           digits: 2,
-        },//标价折扣
+        },
+        //非标号
         {
           field: 'nonStdCode', type: 'text', equal: true,
-        },//非标号
+        },
+        //出库中数量
         {
           field: 'outingQty',
           type: 'disabled',
           number: true,
           digits: 0,
-        },//出库中数量
+        },
+        //已出库数量
         {
           field: 'outQty',
           type: 'disabled',
           number: true,
           digits: 0,
-        },//已出库数量
+        },
+        //退货数量
         {
           field: 'returnQty',
           type: 'disabled',
           number: true,
           digits: 0,
-        },//退货数量
+        },
         {
           field: 'remarks', type: 'text', equal: true,
         },