Explorar o código

销售出库选择源单(未完成,先注释)

koushanshan hai 1 ano
pai
achega
26da40dbf8

+ 4 - 0
src/api/pages/sale/order-item.js

@@ -8,6 +8,10 @@ export default {
     prefix: '/mdm-server/sale/orderItem/',
     //以销定采
     purchaseBasedOnSaleSelectOrder:'purchase_based_on_sale_select_order',
+    // 销售出库页面选择源单
+    selectBySaleOut:'select_by_sale_out',
+    //销售出库页面选择源单条件查询分页
+    selectBySaleOutByPage:'select_by_sale_out_by_page',
   }
 }
 

+ 37 - 1
src/components/business/select-magnifier/setting.js

@@ -303,7 +303,43 @@ const data = {
       {field: 'whCode', width: 'auto'},
       {field: 'whName', width: 'auto'},
     ],
-  }
+  },
+  // 销售出库选来源单号
+  saleOrderOutFromNo: {
+    // 接口文件
+    serviceStr: 'orderItemService',
+    // 下拉的查询方法
+    methodsName: 'selectBySaleOutByPage',
+    // 放大镜查询方法
+    methodsNameDetail: 'selectBySaleOutByPage',
+    // 查询条件
+    searchContent: [
+      {itemCode: 'orderNo'},
+    ],
+    // 查询条件一行个数
+    colCount: 2,
+    // 弹窗的宽度
+    modalWidth: 550,
+    // 列表主键Id
+    selectKey: 'orderId',
+    // 列表主键名称
+    selectLabel: 'orderNo',
+    // 列表列
+    columns: [
+      {field: 'orderNo', minWidth: '40'},
+      {field: 'itemQty', minWidth: '40'},
+      {field: 'canOutQty', minWidth: '40'},
+      {field: 'cusName', minWidth: '40'},
+      {field: 'cusCode', minWidth: '40'},
+      {field: 'cusPhone', minWidth: '40'},
+      {field: 'skuCode', minWidth: '40'},
+      {field: 'skuModel', minWidth: '40'},
+      {field: 'skuName', minWidth: '40'},
+      {field: 'brandName', minWidth: '40'},
+      {field: 'shortName', minWidth: '40'},
+      {field: 'channelName', minWidth: '40'},
+    ],
+  },
 }
 
 

+ 3 - 1
src/config/index.js

@@ -702,7 +702,9 @@ export default {
     //供应商与对象
     supplierAndCustomer: 'supplierAndCustomer',
     //组织机构
-    organization: 'organization'
+    organization: 'organization',
+    //销售出库选来源单号
+    saleOrderOutFromNo:'saleOrderOutFromNo',
   },
   /**
    * @desc   : 收款完成

+ 2 - 0
src/locale/lang/zh-CN.js

@@ -377,6 +377,7 @@ export const columns = {
   purchaseReal:'采购成交',
   intoNo:'入库单号',
   fromNo:'来源单号',
+  fromIdList:'来源单号',
   waitEntry:'待入库',
   ingEntry:'已入库',
   itemIntoAmt:'入库金额',
@@ -703,6 +704,7 @@ export const columns = {
   flgAutoHandle: '自动办理标识',
   flgHandleSetting: '欠货出库',
   primaryQty: '可编辑数量',
+  canOutQty: '可出库数量',
 }
 
 /**

+ 1 - 1
src/view/mst/supplier/index.vue

@@ -152,7 +152,7 @@ export default {
         supType: null,
         serviceCategories: null,
         brandIds: [],
-        brandNames:[],
+        brandNames:null,
         remarks: null,
         orgId : self.$store.state.user.orgId,
         orgName  : self.$store.state.user.orgName,

+ 68 - 25
src/view/sale/order-out/form.vue

@@ -54,27 +54,27 @@
             <InputPop :telephone="true" ref="contactPhone" :readonly="checkColumnIsEdit('contactPhone')"
                       v-model="formData.contactPhone" :disabled="checkColumnIsEdit('contactPhone')"/>
           </DkFormItem>
-          <!--业务部门-->
-          <DkFormItem prop="orgId" :required="true">
-            <MultiSelect v-model="formData.orgList"
-                         ref="org"
-                         main-field="ownerFlag"
-                         rate-field="allocationRatio"
-                         :order-id="formData.orderId"
-                         :default-value="formData.orgName"
-                         @ok="orgOk($event)"
-                         :type="this.$config.MagnifierType.org"/>
-          </DkFormItem>
-          <!--业务员-->
-          <DkFormItem prop="staffId" :required="true">
-            <MultiSelect v-model="formData.staffList"
-                         main-field="ownerFlag"
-                         rate-field="allocationRatio"
-                         :order-id="formData.orderId"
-                         :default-value="formData.staffName"
-                         @ok="staffOk($event)"
-                         :type="this.$config.MagnifierType.staff"/>
-          </DkFormItem>
+<!--          &lt;!&ndash;业务部门&ndash;&gt;-->
+<!--          <DkFormItem prop="orgId" :required="true">-->
+<!--            <MultiSelect v-model="formData.orgList"-->
+<!--                         ref="org"-->
+<!--                         main-field="ownerFlag"-->
+<!--                         rate-field="allocationRatio"-->
+<!--                         :order-id="formData.orderId"-->
+<!--                         :default-value="formData.orgName"-->
+<!--                         @ok="orgOk($event)"-->
+<!--                         :type="this.$config.MagnifierType.org"/>-->
+<!--          </DkFormItem>-->
+<!--          &lt;!&ndash;业务员&ndash;&gt;-->
+<!--          <DkFormItem prop="staffId" :required="true">-->
+<!--            <MultiSelect v-model="formData.staffList"-->
+<!--                         main-field="ownerFlag"-->
+<!--                         rate-field="allocationRatio"-->
+<!--                         :order-id="formData.orderId"-->
+<!--                         :default-value="formData.staffName"-->
+<!--                         @ok="staffOk($event)"-->
+<!--                         :type="this.$config.MagnifierType.staff"/>-->
+<!--          </DkFormItem>-->
           <!--客户来源-->
           <DkFormItem prop="cusFrom" :required="true">
             <SelectPop v-model="formData.cusFrom" ref="cusFrom" :multiple="false"
@@ -109,6 +109,15 @@
               </i-switch>
             </template>
           </DkFormItem>
+          <!--来源单号-->
+<!--          <DkFormItem prop="fromIdList" :data-type="$config.dataType.array">-->
+<!--          <SelectMagnifier v-model="formData.fromIdList"-->
+<!--                           :input-read-only="false" :multiple="true"-->
+<!--                           :displayText="formData.fromNoList"-->
+<!--                           :type="this.$config.MagnifierType.saleOrderOutFromNo"-->
+<!--                           :disabled="chooseFromNoFlag"-->
+<!--                           @ok="selectFromNoList"/>-->
+<!--        </DkFormItem>-->
           <!--单据备注-->
           <DkFormItem prop="remarks" :span="12">
             <InputPop ref="remarks" v-model="formData.remarks"
@@ -120,6 +129,7 @@
       <DkPanel prop="goodsInformation">
         <div id="search-cond-div-goods-info" ref="search-cond-div-goods-info" slot="content">
           <EditTable ref="goodsTable" :data="formData.itemList" showFooter major-field="itemId"
+                     :addFlag="addAndEditFlag"  @delRow="delTableRow"
                      :columns="addTogetherItemColumns" controlId="skuId" @changeNonStandard="changeNonStandard"
                      @cell-click="handleClickTable" @on-choose="getTotals" @changeValue="getTotals"
           ></EditTable>
@@ -208,6 +218,8 @@ export default {
         outingAmt: null,
         flgAutoHandle: true,
         limitEdit: true,
+        fromIdList:[],//来源单号
+        fromNoList:null,
       },
       addressArea: [],
       cityData: [],
@@ -356,6 +368,8 @@ export default {
         sumOutingQty: 0,
         sumOutingAmt: 0,
       },
+      addAndEditFlag:true,//新建编辑行
+      chooseFromNoFlag:false,//可选来源单号
     }
   },
   methods: {
@@ -565,7 +579,33 @@ export default {
       this.formData.addressFull = null;
       this.setCustomerFlag = false;
     },
-
+    /**
+     *   @desc   : 选择来源单据
+     *   @date   : 2024/6/25 9:53
+     *   @author : 寇珊珊
+     */
+    // selectFromNoList(rows){
+    //   this.addAndEditFlag = false
+    //   console.log("选择来源单据", rows)
+    //   if (rows && rows.length > 0) {
+    //     this.$refs['goodsTable'].tableData = rows
+    //   }
+    //   console.log("this.$refs['goodsTable']", this.$refs['goodsTable'].tableData)
+    // },
+    /**
+     *   @desc   : 删除明细行
+     *   @date   : 2024/6/28 15:12
+     *   @author : 寇珊珊
+     */
+    delTableRow(row){
+      let table  = this.$refs['goodsTable'].getTableDataFilter()
+      if(table && table.length ==0){
+        this.chooseFromNoFlag = false
+        this.addAndEditFlag  = true
+        this.formData.fromNoList  = []
+        this.formData.fromIdList  = []
+      }
+    },
     /**
      * @desc   : 修改包装数
      * @author : 周兴
@@ -583,7 +623,6 @@ export default {
       table[rowIndex]['piece'] = row['nonStandardForm']['piece'] ?row['nonStandardForm']['piece']:0
       this.getTotale(table)
     },
-
     /**
      *   @desc   : 获取商品表格中数量、金额后计算总单信息
      *   @date   : 2022/5/30 15:31
@@ -591,6 +630,12 @@ export default {
      */
     getTotals(field, row, rowIndex) {
       let table = this.$refs['goodsTable'].getTableDataFilter();
+      console.log("this.$refs['goodsTable'].tableData",this.$refs['goodsTable'].tableData )
+      if (this.$refs['goodsTable'].tableData  && this.$refs['goodsTable'].tableData.length > 0) {
+        this.chooseFromNoFlag = true
+      }else{
+        this.chooseFromNoFlag = false
+      }
       this.getTotale(table)
       this.decimalPlaces = row['decimalPlaces']
         if(row['subUnitId']){
@@ -619,7 +664,6 @@ export default {
       row['box'] = row['nonStandardForm']['box']
       row['piece'] = row['nonStandardForm']['piece']
     },
-
     /**
      * @desc   : 计算合计
      * @author : 常皓宁
@@ -641,7 +685,6 @@ export default {
         this.goodsFootFormData.sumOutingAmt = sumOutingAmt;
       }
     },
-
     /**
      * @desc   :表格点击事件
      * @author : 付斌