|
|
@@ -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>
|
|
|
+<!-- <!–业务部门–>-->
|
|
|
+<!-- <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>-->
|
|
|
<!--客户来源-->
|
|
|
<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 : 付斌
|