Переглянути джерело

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

changhaoning 2 роки тому
батько
коміт
4b6a00c5a4

+ 1 - 0
src/api/pages/fin/receipt.js

@@ -6,6 +6,7 @@
 export default {
   receiptService: {
     prefix: '/mdm-server/mac/recPay/',
+    selectRpInfoById: 'select_rp_info_by_id',
     insertReceivableReceipt: 'insert_receivable_receipt',
   }
 }

+ 4 - 2
src/api/pages/sale/order-out-return.js

@@ -5,9 +5,11 @@
  */
 export default {
   orderOutReturnService: {
-    prefix: '/mdm-server/sale/outReturn/',
-    selectOutReturnInfoById: 'select_out_return_info_by_id',
+    prefix: '/mdm-server/ivt/outbound_sale_return/',
+    selectOutboundInfoById: 'select_outbound_info_by_id',
     getOutReturnForUpdate: 'get_out_return_for_update',
+    outboundInsert: 'outbound_insert',
+    outboundUpdate: 'outbound_update',
   }
 }
 

+ 3 - 1
src/api/pages/sale/order-out.js

@@ -5,9 +5,11 @@
  */
 export default {
   orderOutService: {
-    prefix: '/mdm-server/ivt/outbound/',
+    prefix: '/mdm-server/ivt/outbound_sale_order/',
     selectOutboundInfoById: 'select_outbound_info_by_id',
     getOutboundForUpdate: 'get_outbound_for_update',
+    outboundInsert: 'outbound_insert',
+    outboundUpdate: 'outbound_update',
   }
 }
 

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

@@ -1197,7 +1197,7 @@ export default {
             valueFormat: {code: 'staffName'},
           },
           {
-            itemCode: 'jobId',
+            itemcode: 'jobId',
             valueFormat: {code: 'jobIds'},
             valueKind: this.$config.docUserInput.mSearch,
             magnifierType: this.$config.MagnifierType.job

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

@@ -306,6 +306,7 @@ export const columns = {
   outNo: '出库单号',
   goodsDetail: '货物明细',
   collectionDetail: '收款明细',
+  recHandleDetail: '应收核销明细',
   filesDetail: '附件明细',
   outFiles: '出库附件',
   orderFiles: '订单附件',
@@ -447,6 +448,16 @@ export const columns = {
   orgMac:'资金账户',
   staffPurName:'采购人员',
   orgPurName:'采购部门',
+  checkStaff:'盘点员工',
+  checkOrg:'盘点部门',
+  checkDate:'盘点日期',
+  checkNo:'盘点单号',
+  checkStatusName:'盘点状态',
+  checkorg:'盘点部门',
+  oInvQty:'原库存量',
+  lossReason:'原库原因',
+  checkQty:'盘点数量',
+  balanceQty:'差异数量',
 }
 
 /**

+ 0 - 2
src/view/fin/receipt/form.vue

@@ -26,14 +26,12 @@
           <DkFormItem prop="orgId" :label="$t('orgId')">
             <SelectMagnifier v-model="formData.orgId" :display-text="formData.orgName"
                              :type="this.$config.MagnifierType.org"
-                             :initSearchFlag="true"
                              :multiple="false" :disabled="true"/>
           </DkFormItem>
           <!--业务员-->
           <DkFormItem prop="staffId" :label="$t('staffId')">
             <SelectMagnifier v-model="formData.staffId" :display-text="formData.staffName"
                              :type="this.$config.MagnifierType.staff"
-                             :initSearchFlag="true"
                              :multiple="false" :disabled="true"/>
           </DkFormItem>
           <!--收款时间-->

+ 74 - 11
src/view/fin/receipt/index.vue

@@ -55,12 +55,27 @@
         </DkTable>
       </div>
       <div slot="bottom">
-        <DkTable :id="'table-'+$options.name" ref="detail-select" :data="tableDataDetail_rpDetail" showFooter
-                 :height="this.tableHeight * (1-split)" primaryKey="itemId" name="table">
-          <DkTableColumn field="macName"/>
-          <DkTableColumn field="amtRec" :digits="2" dataType="number" sum/>
-          <DkTableColumn field="remarks"/>
-        </DkTable>
+        <DkTabs v-model="detailModel" :options="detailOptions" @on-click="detailTabsClick"></DkTabs>
+        <!--收款明细-->
+        <div v-show="visRpItemFlag">
+          <DkTable :id="'table-'+$options.name" ref="rpItem-select" :data="tableDataDetail_rpItem" showFooter
+                   :height="this.tableHeight * (1-split)" primaryKey="itemId" name="tableRpItem">
+            <DkTableColumn field="macName"/>
+            <DkTableColumn field="amtRec" :digits="2" dataType="number" sum/>
+            <DkTableColumn field="remarks"/>
+          </DkTable>
+        </div>
+        <div v-show="visRecPayHandleItemFlag">
+          <DkTable :id="'table-'+$options.name" ref="recPayHandleItem-select" :data="tableDataDetail_recPayHandleItem"
+                   showFooter
+                   :height="this.tableHeight * (1-split)" primaryKey="itemId" name="tableRecPayHandleItem">
+            <DkTableColumn field="biznisNo"/>
+            <DkTableColumn field="accDate"/>
+            <DkTableColumn field="amtShould" :title="$t('amtShouldReceivable')" :digits="2" dataType="number" sum/>
+            <DkTableColumn field="amtReceivableHandle" :digits="2" dataType="number" sum/>
+            <DkTableColumn field="amtWaive" :title="$t('amtWaiveHandle')" :digits="2" dataType="number" sum/>
+          </DkTable>
+        </div>
       </div>
     </DkSplit>
   </div>
@@ -76,7 +91,14 @@ export default {
     let self = this
     return {
       tableData: [],
-      tableDataDetail_rpDetail: [],
+      tableDataDetail_rpItem: [],
+      tableDataDetail_recPayHandleItem: [],
+      detailModel: 'collectionDetail',
+      detailOptions: [{label: self.$t('collectionDetail'), name: 'collectionDetail'},//收款明细
+        {label: self.$t('recHandleDetail'), name: 'recHandleDetail'}, //货物明细
+      ],
+      visRpItemFlag: false,
+      visRecPayHandleItemFlag: true,
       searchContent: [
         {
           itemCode: '收款单号-文本',
@@ -228,8 +250,7 @@ export default {
      */
     getData(params) {
       this.tableData = [];
-
-      return this.excute(this.$service.cusReceiptService, this.$service.cusReceiptService.selectByCond, params)
+      return this.excute(this.$service.receiptService, this.$service.receiptService.selectByCond, params)
     },
     /**
      * @desc   : 行改变事件
@@ -238,13 +259,55 @@ export default {
      */
     currentChange({row}) {
       this.loading = true
-      this.excuteNoParam(this.$service.cusReceiptService, this.$service.cusReceiptService.selectRpInfoById, [row.rpId], false).then(res => {
+      this.tableDataDetail_rpItem = null;
+      this.tableDataDetail_recPayHandleItem = null;
+      this.excuteNoParam(this.$service.receiptService, this.$service.receiptService.selectRpInfoById, [row.rpId], false).then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {
-          this.tableDataDetail_rpDetail = res.data.recPayItem;
+          this.tableDataDetail_rpItem = res.data.recPayItem;
+          this.tableDataDetail_recPayHandleItem = res.data.recPayHandleItem;
         }
         this.loading = false
       })
     },
+    /**
+     * @desc   : 作废
+     * @author : 付斌
+     * @date   : 2024-03-05 8:56
+     */
+    invalid(rows) {
+      if (rows && rows.length > 0) {
+        this.$IBMessage({content: this.$t('Q_002', {'param': this.$v('invalid')}), title: this.$t('systemQuestion')},
+          {
+            ok: () => {
+              this.loading = true
+              this.excuteNoParam(this.$service.receiptService, this.$service.receiptService.invalid, [rows[0].rpId], false).then(res => {
+                if (res.code === this.$config.SUCCESS_CODE) {
+                  this.$Message.success(this.$t('I_001', {'param': this.$t('invalid')}))
+                } else {
+                  this.$Message.warning(res.message)
+                }
+                this.loading = false
+              })
+            },
+          })
+      }
+    },
+    /**
+     * @desc   : 点击Tab进行切换
+     * @author : 付斌
+     * @date   : 2024-02-19 11:33
+     */
+    detailTabsClick(val) {
+      if (val === 'recHandleDetail') {
+        this.visRecPayHandleItemFlag = true
+        this.visRpItemFlag = false
+        this.visFilesDetailFlag = false
+      } else if (val === 'collectionDetail') {
+        this.visRecPayHandleItemFlag = false
+        this.visRpItemFlag = true
+        this.visFilesDetailFlag = false
+      }
+    },
   },
   /**
    * @desc   : 在实例创建完成后被立即同步调用

+ 1 - 3
src/view/ivt/ivt-freeze/form.vue

@@ -4,7 +4,7 @@
     <DkCollapse @on-change="changeCollapse" ref="collapse" :height="tableHeight">
       <DkPanel prop="essentialInformation">
         <!--  单据信息  -->
-        <DkForm slot="content" ref="formInline" v-model="formData" style="width:100%">
+        <DkForm slot="content" ref="formInline" v-model="formData">
           <!--调整单号-->
           <DkFormItem prop="freezeNo">
             <InputPop ref="freezeNo" v-model="formData.freezeNo" :readonly="true"/>
@@ -32,7 +32,6 @@
             <SelectMagnifier v-model="formData.orgId" :display-text="formData.orgName"
                              :type="this.$config.MagnifierType.org"
                              @ok="orgOk"
-                             :initSearchFlag="true"
                              :disabled="checkColumnIsEdit('orgId')"
                              :multiple="false"/>
           </DkFormItem>
@@ -42,7 +41,6 @@
                              :type="this.$config.MagnifierType.staff"
                              @ok="staffOk"
                              :disabled="checkColumnIsEdit('staffId')"
-                             :initSearchFlag="true"
                              :multiple="false"/>
           </DkFormItem>
           <!--自动解冻时间-->

+ 72 - 23
src/view/mst/supplier/index.vue

@@ -69,46 +69,50 @@
           <InputPop v-model="formData.supName"/>
         </DkFormItem>
         <!--  供应商类别  -->
-        <DkFormItem prop="supType">
+        <DkFormItem prop="supType" :required="true">
           <SelectPop v-model="formData.supType" ref="supType" :options="supTypeList" :multiple="false"
+                     @on-select="onChange"
                      labelKey="kindName" valueKey="kindCode">
           </SelectPop>
         </DkFormItem>
         <!--  业务员  -->
         <DkFormItem prop="staffPurName" :data-type="$config.dataType.array">
-          <SelectMagnifier v-model="formData.staffId" :display-text="formData.staffId"
+          <SelectMagnifier v-model="formData.staffId" :display-text="formData.staffName"
                            :type="this.$config.MagnifierType.staff"
-                           :multiple="false"></SelectMagnifier>
+                           :multiple="false"  @ok="staffOk"></SelectMagnifier>
+
         </DkFormItem>
         <!--  业务部门  -->
         <DkFormItem prop="orgPurName" :data-type="$config.dataType.array">
-          <SelectMagnifier v-model="formData.orgId" :display-text="formData.orgId"
-                           :type="this.$config.MagnifierType.org"
+          <SelectMagnifier v-model="formData.orgId" :display-text="formData.orgName"
+                           :type="this.$config.MagnifierType.org" @ok="orgOk"
                            :multiple="false"></SelectMagnifier>
         </DkFormItem>
-
-        <!--  品牌  -->
-        <DkFormItem prop="brandIds" :data-type="$config.dataType.array">
-          <SelectMagnifier v-model="formData.brandIds" :display-text="formData.brandIds"
-                           :type="this.$config.MagnifierType.brand"
-                           :multiple="true"></SelectMagnifier>
-        </DkFormItem>
-
         <!--  联系人  -->
         <DkFormItem prop="contactName">
           <InputPop v-model="formData.contactName"/>
         </DkFormItem>
         <!--  联系电话  -->
         <DkFormItem prop="contactPhone">
-          <InputPop v-model="formData.contactPhone"/>
+          <InputPop v-model="formData.contactPhone"  :telephone="true"/>
+        </DkFormItem>
+        <!--  品牌  -->
+        <DkFormItem v-show="flgValidBrand" prop="brandIds" :data-type="$config.dataType.array">
+          <SelectMagnifier v-model="formData.brandIds" :display-text="formData.brandName"
+                           :type="this.$config.MagnifierType.brand"
+                           :multiple="true"></SelectMagnifier>
         </DkFormItem>
         <!--  服务类别  -->
-        <DkFormItem prop="serviceCategories">
+        <DkFormItem v-show="flgValidServiceCategories" prop="serviceCategories">
           <SelectPop v-model="formData.serviceCategories" ref="serviceCategories" :options="serviceCategoriesList"
                      :multiple="true"
                      labelKey="kindName" valueKey="kindCode">
           </SelectPop>
         </DkFormItem>
+        <!--   期初欠款     -->
+        <DkFormItem prop="期初欠款">
+          <InputPop v-model="formData.supName" textareaFlag/>
+        </DkFormItem>
         <!--   备注     -->
         <DkFormItem prop="remarks">
           <InputPop v-model="formData.remarks" textareaFlag/>
@@ -135,6 +139,8 @@ export default {
       brandIds: [],
       orgId: null,
       staffId: null,
+      flgValidBrand:false,
+      flgValidServiceCategories:false,
       formData: {
         supCode: null,
         supName: null,
@@ -145,7 +151,10 @@ export default {
         supType: null,
         serviceCategories: null,
         brand: null,
-        remarks: null
+        remarks: null,
+        orgId : null,
+        orgCode  : null,
+        orgName  : null,
       },
       // 查询条件
       searchContent: [
@@ -156,10 +165,10 @@ export default {
           itemCode: 'supTypeList',
           itemName: self.$t('supType'),
           valueFormat: {
-            code: 'supTypeList',
+            code: 'kindType',
             data: [],
-            valueKey: 'kindName',
-            labelKey: 'kindCode',
+            valueKey: 'kindCode',
+            labelKey: 'kindName',
           },
           valueKind: 'M-CHOICE'
         },
@@ -187,11 +196,14 @@ export default {
      * @date   : 2024/3/4 16:33
      */
     getSupType() {
+      // 定义系统字典查询条件
       let params = {
         kindType: this.$config.kindType.supType,
       }
+      // 根据条件查询系统字典信息
       this.excute(this.$service.commonService, this.$service.commonService.getDataKind, params).then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {
+          // searchContent页面上的查询内容
           let list = this.searchContent.filter(it => it.valueFormat.code == 'kindType')
           if (list.length > 0) {
             list[0].valueFormat.data = res.data
@@ -212,10 +224,6 @@ export default {
       }
       this.excute(this.$service.commonService, this.$service.commonService.getDataKind, params).then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {
-          let list = this.searchContent.filter(it => it.valueFormat.code == 'kindType')
-          if (list.length > 0) {
-            list[0].valueFormat.data = res.data
-          }
           this.serviceCategoriesList = res.data;
         }
       })
@@ -251,6 +259,47 @@ export default {
       }
     },
 
+    /**
+     *   @desc   : 获取业务员相关
+     *   @author : 宋扬
+     *   @date   : 2024/3/25 15:03
+     */
+    staffOk(val) {
+      if (val && val.length > 0) {
+        this.formData.orgId = val[0].orgId
+        this.formData.orgCode = val[0].orgCode
+        this.formData.orgName = val[0].orgName
+      }
+    },
+
+    /**
+     * @desc   : 获取部门相关
+     * @author : 宋扬
+     * @date   : 2024/3/25 15:03
+     */
+    orgOk(val) {
+      if (val && val.length > 0) {
+        this.formData.orgId = val[0].orgId
+        this.formData.orgCode = val[0].orgCode
+        this.formData.orgName = val[0].orgName
+      }
+    },
+
+    /**
+     * @desc   : 供应商类别选择事件
+     * @author : 宋扬
+     * @date   : 2024/3/25 10:26
+     */
+    onChange(val){
+      if("供应商类别-采购"===val){
+        this.flgValidBrand=true;
+        this.flgValidServiceCategories=false;
+      }
+      else{
+        this.flgValidBrand=false;
+        this.flgValidServiceCategories=true;
+      }
+    },
   },
   created() {
     this.primaryKey = 'supId'  // 设置主键Id

+ 0 - 2
src/view/sale/cus-receipt/form.vue

@@ -26,14 +26,12 @@
           <DkFormItem prop="orgId" :label="$t('orgId')">
             <SelectMagnifier v-model="formData.orgId" :display-text="formData.orgName"
                              :type="this.$config.MagnifierType.org"
-                             :initSearchFlag="true"
                              :multiple="false" :disabled="true"/>
           </DkFormItem>
           <!--业务员-->
           <DkFormItem prop="staffId" :label="$t('staffId')">
             <SelectMagnifier v-model="formData.staffId" :display-text="formData.staffName"
                              :type="this.$config.MagnifierType.staff"
-                             :initSearchFlag="true"
                              :multiple="false" :disabled="true"/>
           </DkFormItem>
           <!--收款时间-->

+ 4 - 6
src/view/sale/order-out/form.vue

@@ -39,14 +39,12 @@
           <DkFormItem prop="orgId" :label="$t('orgId')">
             <SelectMagnifier v-model="formData.orgId" :display-text="formData.orgName"
                              :type="this.$config.MagnifierType.org"
-                             :initSearchFlag="true"
                              :multiple="false" :disabled="true"/>
           </DkFormItem>
           <!--业务员-->
           <DkFormItem prop="staffId" :label="$t('staffId')">
             <SelectMagnifier v-model="formData.staffId" :display-text="formData.staffName"
                              :type="this.$config.MagnifierType.staff"
-                             :initSearchFlag="true"
                              :multiple="false" :disabled="true"/>
           </DkFormItem>
           <!--客户来源-->
@@ -412,11 +410,11 @@ export default {
      */
     saveData() {
       if (this.type === this.$config.formMode.add) {
-        this.excute(this.$service.orderOutService, this.$service.orderOutService.insert, this.params);
-        this.$Message.success(this.$t('I_001', {'param': '保存'}))
-        this.close(false);
+        this.excute(this.$service.orderOutService, this.$service.orderOutService.outboundInsert, this.params);
+        // this.$Message.success(this.$t('I_001', {'param': '保存'}))
+        // this.close(false);
       } else if (this.type === this.$config.formMode.edit){
-        return this.excute(this.$service.orderOutService, this.$service.orderOutService.update, this.params);
+        return this.excute(this.$service.orderOutService, this.$service.orderOutService.outboundUpdate, this.params);
       }
     },
 

+ 2 - 6
src/view/sale/order-return/form.vue

@@ -39,14 +39,12 @@
           <DkFormItem prop="orgId" :label="$t('orgId')">
             <SelectMagnifier v-model="formData.orgId" :display-text="formData.orgName"
                              :type="this.$config.MagnifierType.org"
-                             :initSearchFlag="true"
                              :multiple="false" :disabled="true"/>
           </DkFormItem>
           <!--业务员-->
           <DkFormItem prop="staffId" :label="$t('staffId')">
             <SelectMagnifier v-model="formData.staffId" :display-text="formData.staffName"
                              :type="this.$config.MagnifierType.staff"
-                             :initSearchFlag="true"
                              :multiple="false" :disabled="true"/>
           </DkFormItem>
           <!--客户来源-->
@@ -386,13 +384,11 @@ export default {
      */
     saveData() {
       if (this.type === this.$config.formMode.add) {
-        this.excute(this.$service.orderOutReturnService, this.$service.orderOutReturnService.insert, this.params);
-        this.$Message.success(this.$t('I_001', {'param': '保存'}))
-        this.close(false);
+        this.excute(this.$service.orderOutReturnService, this.$service.orderOutReturnService.outboundInsert, this.params);
       }
       //编辑
       else if (this.type === this.$config.formMode.edit) {
-        return this.excute(this.$service.orderOutReturnService, this.$service.orderOutReturnService.update, this.params);
+        return this.excute(this.$service.orderOutReturnService, this.$service.orderOutReturnService.outboundUpdate, this.params);
       }
       //入库办理
       else if(this.type === this.$config.formMode.handle){

+ 19 - 16
src/view/sale/order-return/index.vue

@@ -38,19 +38,20 @@
                  :page-size-opts="pageSizeOpts"
                  :page-size="pageInfo.pageSize"
                  name="table">
-          <DkTableColumn field="returnNo"></DkTableColumn>
+          <DkTableColumn field="outNo"></DkTableColumn>
           <DkTableColumn field="orderNo"></DkTableColumn>
           <DkTableColumn field="cusName"></DkTableColumn>
           <DkTableColumn field="cusPhone"></DkTableColumn>
           <DkTableColumn field="contactName"></DkTableColumn>
           <DkTableColumn field="addressFull"></DkTableColumn>
-          <DkTableColumn field="returnStatusName" title="退货状态"></DkTableColumn>
-          <DkTableColumn field="intoStatusName" title="入库状态"></DkTableColumn>
-          <DkTableColumn field="sumQuantity" :digits="0" sum></DkTableColumn>
-          <DkTableColumn field="sumAmount" :digits="2" sum></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"></DkTableColumn>
           <DkTableColumn field="orgName"></DkTableColumn>
           <DkTableColumn field="staffName"></DkTableColumn>
-          <DkTableColumn field="pickupDate" :dataType="$config.columnType.date"></DkTableColumn>
           <DkTableColumn field="makeTime" :dataType="$config.columnType.dateTime"></DkTableColumn>
           <DkTableColumn field="makeStaffName"></DkTableColumn>
           <DkTableColumn field="flgValid" type="switch"/>
@@ -65,16 +66,18 @@
         <div v-show="visGoodsDetailFlag">
           <DkTable :id="'table-'+$options.name" ref="detail-select" :data="tableDataDetail_goodsDetail" showFooter
                    :height="this.tableHeight * (1-split)" primaryKey="itemId" name="table">
-            <DkTableColumn field="outNo"></DkTableColumn>
+            <DkTableColumn field="skuModel"></DkTableColumn>
             <DkTableColumn field="skuName"></DkTableColumn>
             <DkTableColumn field="skuCode"></DkTableColumn>
-            <DkTableColumn field="itemQty" :title="$t('returnQty1')" :digits="0" sum></DkTableColumn>
-            <DkTableColumn field="priceReturn" :digits="0" sum></DkTableColumn>
-            <DkTableColumn field="itemAmt" :title="$t('returnAmt1')" :digits="2" sum></DkTableColumn>
-            <DkTableColumn field="intoingQty" :digits="0" sum></DkTableColumn>
-            <DkTableColumn field="intoingAmt" :digits="0" sum></DkTableColumn>
-            <DkTableColumn field="intoQty" :digits="0" sum></DkTableColumn>
-            <DkTableColumn field="intoAmt"></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="whName"></DkTableColumn>
             <DkTableColumn field="nonStdCode"></DkTableColumn>
             <DkTableColumn field="remarks"></DkTableColumn>
           </DkTable>
@@ -272,9 +275,9 @@ export default {
      */
     currentChange({row}) {
       this.loading = true
-      this.excuteNoParam(this.$service.orderOutReturnService, this.$service.orderOutReturnService.selectOutReturnInfoById, [row.returnId], false).then(res => {
+      this.excuteNoParam(this.$service.orderOutReturnService, this.$service.orderOutReturnService.selectOutboundInfoById, [row.outId], false).then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {
-          this.tableDataDetail_goodsDetail = res.data.outReturnItem;
+          this.tableDataDetail_goodsDetail = res.data.outboundItem;
         }
         this.loading = false
       })

+ 0 - 2
src/view/sale/order/form.vue

@@ -82,7 +82,6 @@
           <!--            <SelectMagnifier v-model="formData.orgId" :display-text="formData.orgName"-->
           <!--                             :type="this.$config.MagnifierType.org"-->
           <!--                             @ok="orgOk"-->
-          <!--                             :initSearchFlag="true"-->
           <!--                             :readonly="checkColumnIsEdit('orgId')"-->
           <!--                             :disabled="checkColumnIsEdit('orgId')"-->
           <!--                             :multiple="false"/>-->
@@ -92,7 +91,6 @@
           <!--            <SelectMagnifier v-model="formData.staffId" :display-text="formData.staffName"-->
           <!--                             :type="this.$config.MagnifierType.staff"-->
           <!--                             @ok="staffOk"-->
-          <!--                             :initSearchFlag="true"-->
           <!--                             :readonly="checkColumnIsEdit('staffId')"-->
           <!--                             :disabled="checkColumnIsEdit('staffId')"-->
           <!--                             :multiple="false"/>-->