|
|
@@ -22,6 +22,7 @@
|
|
|
status-icon
|
|
|
:rules="rulesThis"
|
|
|
label-width="80px"
|
|
|
+ label-position="left"
|
|
|
class="demo-ruleForm"
|
|
|
size="mini"
|
|
|
>
|
|
|
@@ -31,19 +32,33 @@
|
|
|
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item label="商品分类" prop="cat_id">
|
|
|
- <company-sort
|
|
|
- :value="ruleForm.cat_id"
|
|
|
- :placeholder="'商品分类'"
|
|
|
- :disabled="id !== '003'"
|
|
|
+ <el-form-item label="销售方公司:" label-width="100px" prop="companyNo">
|
|
|
+ <p style="font-size:14px;color:#606266;font-weight:700">{{ getCompanyWithCode(ruleForm.companyNo).name }}</p>
|
|
|
+ <!-- <search-work-company
|
|
|
+ disabled
|
|
|
+ :value="ruleForm.companyNo"
|
|
|
+ :names="''"
|
|
|
:size="'mini'"
|
|
|
- :company-no="ruleForm.companyNo"
|
|
|
- :names="cat_id_name"
|
|
|
+ :placeholder="'销售方公司'"
|
|
|
+ @searchChange="handleCompanyChange"
|
|
|
+ /> -->
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="购买方公司" label-width="100px" prop="khNo">
|
|
|
+ <search-customer
|
|
|
+ size="mini"
|
|
|
+ :names="khName"
|
|
|
+ :disabled="id !== '003'"
|
|
|
:is-detail="type !== 'add'"
|
|
|
- @searchChange="goods_class_change"
|
|
|
+ :value="ruleForm.khNo"
|
|
|
+ placeholder="购买方公司"
|
|
|
+ @searchChange="handleCustomerChange"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+
|
|
|
<!-- <el-col :span="7">
|
|
|
<el-form-item label="采购员" prop="buyerid">
|
|
|
<search-account
|
|
|
@@ -57,6 +72,20 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col> -->
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="商品分类" prop="cat_id">
|
|
|
+ <company-sort
|
|
|
+ :value="ruleForm.cat_id"
|
|
|
+ :placeholder="'商品分类'"
|
|
|
+ :disabled="id !== '003'"
|
|
|
+ :size="'mini'"
|
|
|
+ :company-no="ruleForm.companyNo"
|
|
|
+ :names="cat_id_name"
|
|
|
+ :is-detail="type !== 'add'"
|
|
|
+ @searchChange="goods_class_change"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="所属平台" prop="platform_id">
|
|
|
@@ -71,41 +100,28 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="单据号" prop="workCode">
|
|
|
- <el-input v-model="ruleForm.workCode" :disabled="id === '007'" maxlength="50" placeholder="单据号" />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
-
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="PO编号" prop="poCode">
|
|
|
- <el-input v-model="ruleForm.poCode" placeholder="PO编号" maxlength="50" :disabled="id === '007'" />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item label="购买方公司" label-width="100px" prop="khNo">
|
|
|
- <search-customer
|
|
|
- size="mini"
|
|
|
- :names="khName"
|
|
|
- :disabled="id !== '003'"
|
|
|
- :is-detail="type !== 'add'"
|
|
|
- :value="ruleForm.khNo"
|
|
|
- placeholder="购买方公司"
|
|
|
- @searchChange="handleCustomerChange"
|
|
|
+ <el-form-item label="平台订单编号" prop="poCode" label-width="110px">
|
|
|
+ <el-input
|
|
|
+ v-model="ruleForm.poCode"
|
|
|
+ placeholder="平台订单编号"
|
|
|
+ maxlength="50"
|
|
|
+ :disabled="id === '007'"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item label="销售方公司" label-width="100px" prop="companyNo">
|
|
|
- <search-work-company
|
|
|
- disabled
|
|
|
- :value="ruleForm.companyNo"
|
|
|
- :names="''"
|
|
|
- :size="'mini'"
|
|
|
- :placeholder="'销售方公司'"
|
|
|
- @searchChange="handleCompanyChange"
|
|
|
+ <el-form-item label="其他单号" prop="workCode">
|
|
|
+ <template #label>
|
|
|
+ <p style="margin-left:10px">其他单号</p>
|
|
|
+ </template>
|
|
|
+ <el-input
|
|
|
+ v-model="ruleForm.workCode"
|
|
|
+ :disabled="id === '007'"
|
|
|
+ maxlength="50"
|
|
|
+ placeholder="其他单号"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -117,13 +133,23 @@
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="收货人" prop="contactor">
|
|
|
- <el-input v-model="ruleForm.contactor" :disabled="id === '007'" placeholder="收货人" maxlength="30" />
|
|
|
+ <el-input
|
|
|
+ v-model="ruleForm.contactor"
|
|
|
+ :disabled="id === '007'"
|
|
|
+ placeholder="收货人"
|
|
|
+ maxlength="30"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="联系电话" prop="mobile">
|
|
|
- <el-input v-model="ruleForm.mobile" :disabled="id === '007'" placeholder="联系电话" maxlength="11" />
|
|
|
+ <el-input
|
|
|
+ v-model="ruleForm.mobile"
|
|
|
+ :disabled="id === '007'"
|
|
|
+ placeholder="联系电话"
|
|
|
+ maxlength="11"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
@@ -143,7 +169,12 @@
|
|
|
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label="联系地址" prop="addr">
|
|
|
- <el-input v-model="ruleForm.addr" :disabled="id === '007'" maxlength="100" placeholder="联系地址" />
|
|
|
+ <el-input
|
|
|
+ v-model="ruleForm.addr"
|
|
|
+ :disabled="id === '007'"
|
|
|
+ maxlength="100"
|
|
|
+ placeholder="联系地址"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -153,10 +184,10 @@
|
|
|
</el-divider>
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
- <el-form-item label="供应商公司" label-width="100px" prop="supplierNo">
|
|
|
+ <el-form-item label="供应商" label-width="100px" prop="supplierNo">
|
|
|
<search-supplier
|
|
|
size="mini"
|
|
|
- placeholder="供应商公司"
|
|
|
+ placeholder="供应商"
|
|
|
:value="ruleForm.supplierNo"
|
|
|
:names="supplierName"
|
|
|
:disabled="id === '007'"
|
|
|
@@ -167,7 +198,12 @@
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="商品名称" prop="goodName">
|
|
|
- <el-input v-model="ruleForm.goodName" placeholder="商品名称" maxlength="50" :disabled="id !== '003'" />
|
|
|
+ <el-input
|
|
|
+ v-model="ruleForm.goodName"
|
|
|
+ placeholder="商品名称"
|
|
|
+ maxlength="50"
|
|
|
+ :disabled="id !== '003'"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -194,7 +230,7 @@
|
|
|
</el-input> -->
|
|
|
<el-input-number
|
|
|
v-model="ruleForm.sale_total"
|
|
|
- :disabled="id !== '003'"
|
|
|
+ :disabled="id !== '003' || disabledField"
|
|
|
style="width: 100%"
|
|
|
controls-position="right"
|
|
|
placeholder="销售总额"
|
|
|
@@ -210,7 +246,7 @@
|
|
|
<el-form-item label="采购总额" prop="cgd_total">
|
|
|
<el-input-number
|
|
|
v-model="ruleForm.cgd_total"
|
|
|
- :disabled="id !== '003'"
|
|
|
+ :disabled="id !== '003' || disabledField"
|
|
|
style="width: 100%"
|
|
|
controls-position="right"
|
|
|
placeholder="采购总额"
|
|
|
@@ -240,13 +276,13 @@
|
|
|
:placeholder="'采购毛利率'"
|
|
|
:min="0"
|
|
|
:max="100"
|
|
|
- :disabled="id === '007'"
|
|
|
+ :disabled="id === '007' || disabledField"
|
|
|
:position="'right'"
|
|
|
:precision="2"
|
|
|
:size="'mini'"
|
|
|
:controls="false"
|
|
|
:append="'%'"
|
|
|
- @reschange="number_change($event, 'cgd_tax')"
|
|
|
+ @reschange="number_change($event, 2)"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -256,7 +292,7 @@
|
|
|
<el-form-item label="单位" prop="goodUnit" label-width="60px">
|
|
|
<search-unit
|
|
|
:value="ruleForm.goodUnit"
|
|
|
- disabled
|
|
|
+ :disabled="type === 'view' || type === 'editCoin'"
|
|
|
:size="'mini'"
|
|
|
:is-detail="type !== 'add'"
|
|
|
:names="unit_name"
|
|
|
@@ -270,14 +306,14 @@
|
|
|
<el-form-item label="销售单价" prop="goodPrice">
|
|
|
<el-input-number
|
|
|
v-model="ruleForm.goodPrice"
|
|
|
- :disabled="id !== '003'"
|
|
|
+ :disabled="id !== '003' || disabledField"
|
|
|
style="width: 100%"
|
|
|
controls-position="right"
|
|
|
placeholder="单价"
|
|
|
:precision="2"
|
|
|
:min="0"
|
|
|
:step="0.01"
|
|
|
- @change="number_change($event, 'goodPrice')"
|
|
|
+ @change="number_change($event, 1)"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -286,13 +322,13 @@
|
|
|
<el-input-number
|
|
|
v-model="ruleForm.cgdPrice"
|
|
|
style="width: 100%"
|
|
|
- :disabled="id === '007'"
|
|
|
+ :disabled="id === '007' || disabledField"
|
|
|
controls-position="right"
|
|
|
placeholder="采购单价"
|
|
|
:precision="2"
|
|
|
:min="0"
|
|
|
:step="0.01"
|
|
|
- @change="number_change($event, 'cgdPrice')"
|
|
|
+ @change="number_change($event, 1)"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -313,7 +349,11 @@
|
|
|
</el-form>
|
|
|
</el-col>
|
|
|
<el-col :span="24" style="text-align: right">
|
|
|
- <el-button v-if="id !== '007'" type="primary" @click="submitForm">保 存</el-button>
|
|
|
+ <el-button
|
|
|
+ v-if="id !== '007'"
|
|
|
+ type="primary"
|
|
|
+ @click="submitForm"
|
|
|
+ >保 存</el-button>
|
|
|
<el-button @click="showModelThis = false">
|
|
|
{{ id == "007" ? "关 闭" : "取 消" }}
|
|
|
</el-button>
|
|
|
@@ -443,7 +483,7 @@ export default {
|
|
|
sale_total: [
|
|
|
{
|
|
|
required: true,
|
|
|
- message: '请输入货款总金额',
|
|
|
+ message: '请输入销售总额',
|
|
|
trigger: 'blur'
|
|
|
}
|
|
|
],
|
|
|
@@ -552,6 +592,10 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
|
+ disabledField() {
|
|
|
+ const { goodNum } = this.ruleForm
|
|
|
+ return !goodNum || Number(goodNum) <= 0
|
|
|
+ },
|
|
|
totalWatchSource() {
|
|
|
const { goodNum, goodPrice } = this.ruleForm
|
|
|
return { goodNum, goodPrice }
|
|
|
@@ -572,29 +616,29 @@ export default {
|
|
|
if (!val) {
|
|
|
this.$emit('cancel')
|
|
|
}
|
|
|
+ },
|
|
|
+ totalWatchSource: {
|
|
|
+ handler({ goodPrice, goodNum }) {
|
|
|
+ if (goodPrice === 0 || goodNum === 0) {
|
|
|
+ this.ruleForm.sale_total = 0
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ this.ruleForm.sale_total = accMul(goodPrice, goodNum)
|
|
|
+ },
|
|
|
+ deep: true
|
|
|
+ },
|
|
|
+ cgdTotalWatchSource: {
|
|
|
+ handler({ cgdPrice, goodNum }) {
|
|
|
+ if (cgdPrice === 0 || goodNum === 0) {
|
|
|
+ this.ruleForm.cgd_total = 0
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ this.ruleForm.cgd_total = accMul(cgdPrice, goodNum)
|
|
|
+ },
|
|
|
+ deep: true
|
|
|
}
|
|
|
- // totalWatchSource: {
|
|
|
- // handler({ goodPrice, goodNum }) {
|
|
|
- // if (goodPrice === 0 || goodNum === 0) {
|
|
|
- // this.ruleForm.sale_total = 0
|
|
|
- // return
|
|
|
- // }
|
|
|
-
|
|
|
- // this.ruleForm.sale_total = accMul(goodPrice, goodNum)
|
|
|
- // },
|
|
|
- // deep: true
|
|
|
- // },
|
|
|
- // cgdTotalWatchSource: {
|
|
|
- // handler({ cgdPrice, goodNum }) {
|
|
|
- // if (cgdPrice === 0 || goodNum === 0) {
|
|
|
- // this.ruleForm.cgd_total = 0
|
|
|
- // return
|
|
|
- // }
|
|
|
-
|
|
|
- // this.ruleForm.cgd_total = accMul(cgdPrice, goodNum)
|
|
|
- // },
|
|
|
- // deep: true
|
|
|
- // }
|
|
|
},
|
|
|
methods: {
|
|
|
async handleHandoverName(e) {
|
|
|
@@ -607,7 +651,27 @@ export default {
|
|
|
this.$refs.ruleForm.validateField('addr_code')
|
|
|
},
|
|
|
number_change(e, type) {
|
|
|
- this.ruleForm[type] = e
|
|
|
+ this.ruleForm.cgd_tax = e
|
|
|
+ const { cgdPrice, goodPrice, cgd_tax } = this.ruleForm
|
|
|
+ let tax = 0
|
|
|
+ let cgd_price = 0
|
|
|
+
|
|
|
+ if (type === 1) {
|
|
|
+ // tax = (1 - cgdPrice / goodPrice)*100
|
|
|
+ tax = accMul(accSub(1, accDiv(cgdPrice, goodPrice)), 100)
|
|
|
+ this.ruleForm.cgd_tax = tax
|
|
|
+ this.$refs.ruleForm.validateField('cgd_tax')
|
|
|
+ }
|
|
|
+ if (type === 2) {
|
|
|
+ // cgd_price = ((100 - cgd_tax) / 100) * goodPrice;
|
|
|
+ cgd_price = accMul(accDiv(accSub(100, cgd_tax), 100), goodPrice) || 0
|
|
|
+ this.ruleForm.cgdPrice = cgd_price
|
|
|
+ this.$refs.ruleForm.validateField('cgdPrice')
|
|
|
+ }
|
|
|
+
|
|
|
+ // if (this.ruleForm.cgdPrice && this.ruleForm.goodPrice) {
|
|
|
+ // this.ruleForm['cgd_tax'] = accMul(accDiv(this.ruleForm.cgdPrice, this.ruleForm.goodPrice), 100) || 0
|
|
|
+ // }
|
|
|
},
|
|
|
handleClose() {
|
|
|
this.showModelThis = false
|
|
|
@@ -676,14 +740,14 @@ export default {
|
|
|
if (this.id !== '003') this.getDetail()
|
|
|
},
|
|
|
number_change_total(current, prop) {
|
|
|
- // const isCgdTotal = prop === 'cgd_total'
|
|
|
- // const { goodNum } = this.ruleForm
|
|
|
- // this.ruleForm[isCgdTotal ? 'cgdPrice' : 'goodPrice'] = accDiv(current, goodNum)
|
|
|
+ const isCgdTotal = prop === 'cgd_total'
|
|
|
+ const { goodNum } = this.ruleForm
|
|
|
+ this.ruleForm[isCgdTotal ? 'cgdPrice' : 'goodPrice'] = accDiv(current, goodNum)
|
|
|
this.ruleForm[prop] = current
|
|
|
|
|
|
- // let tax = 0
|
|
|
- // tax = accMul(accSub(1, accDiv(this.ruleForm.cgd_total, this.ruleForm.sale_total)), 100)
|
|
|
- // this.ruleForm.cgd_tax = tax
|
|
|
+ let tax = 0
|
|
|
+ tax = accMul(accSub(1, accDiv(this.ruleForm.cgd_total, this.ruleForm.sale_total)), 100)
|
|
|
+ this.ruleForm.cgd_tax = tax
|
|
|
// if (this.ruleForm.cgd_total && this.ruleForm.sale_total) {
|
|
|
// this.ruleForm['cgd_tax'] = accMul(accDiv(this.ruleForm.cgd_total, this.ruleForm.sale_total), 100) || 0
|
|
|
// }
|
|
|
@@ -719,6 +783,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
this.cat_id_name = cat_id.map(({ name }) => name).join('_')
|
|
|
+ console.log(this.cat_id_name)
|
|
|
this.unit_name = unitName
|
|
|
|
|
|
this.khName = khName
|
|
|
@@ -726,7 +791,7 @@ export default {
|
|
|
this.detailLoading = false
|
|
|
},
|
|
|
platform_codesearchChange(e) {
|
|
|
- const { id, pay_name } = e
|
|
|
+ const { id, label, pay_name } = e
|
|
|
this.ruleForm.platform_id = id || ''
|
|
|
this.pay_name = pay_name || ''
|
|
|
this.$refs.ruleForm.validateField('platform_id')
|
|
|
@@ -799,5 +864,6 @@ export default {
|
|
|
</script>
|
|
|
|
|
|
<style lang="scss" scoped>
|
|
|
-.terrace {}
|
|
|
+.terrace {
|
|
|
+}
|
|
|
</style>
|
