|
|
@@ -65,7 +65,7 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="24" :sm="12" :lg="12" v-if="goodsList.length && commercialType">
|
|
|
+ <el-col v-if="goodsList.length && commercialType" :span="24" :sm="12" :lg="12">
|
|
|
<el-form-item label="计划单" prop="isPlanOrder">
|
|
|
<el-radio-group v-model="mainForm.isPlanOrder">
|
|
|
<el-radio :label="true">是</el-radio>
|
|
|
@@ -73,12 +73,9 @@
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="24" :sm="12" :lg="12" v-if="goodsList.length && commercialType">
|
|
|
- <el-form-item label="是否直调" prop="isPlanOrder">
|
|
|
- <el-radio-group v-model="mainForm.isPlanOrder">
|
|
|
- <el-radio :label="true">是</el-radio>
|
|
|
- <el-radio :label="false">否</el-radio>
|
|
|
- </el-radio-group>
|
|
|
+ <el-col :span="24" :sm="12" :lg="12">
|
|
|
+ <el-form-item label="是否直调" prop="isAllDirect">
|
|
|
+ <el-checkbox v-model="mainForm.isAllDirect">{{ mainForm.isAllDirect?'是':'否' }}</el-checkbox>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<!-- <el-col :span="24" :sm="12" :lg="12" >-->
|
|
|
@@ -331,8 +328,8 @@
|
|
|
width="80%"
|
|
|
:close-on-click-modal="false"
|
|
|
title="引用销售政策"
|
|
|
- @close="handleClose"
|
|
|
:append-to-body="true"
|
|
|
+ @close="handleClose"
|
|
|
>
|
|
|
<template>
|
|
|
<el-form ref="screenForm" :model="screenForm" label-width="120px" label-position="left" size="small">
|
|
|
@@ -350,9 +347,12 @@
|
|
|
<el-form-item label="规格型号">
|
|
|
<div style="display: flex">
|
|
|
<el-input v-model="screenForm.specification" placeholder="请输入规格型号" />
|
|
|
- <el-button style="margin-left: 10px" type="primary" size="mini" @click="handleGetPolicyList"
|
|
|
- >查询</el-button
|
|
|
- >
|
|
|
+ <el-button
|
|
|
+ style="margin-left: 10px"
|
|
|
+ type="primary"
|
|
|
+ size="mini"
|
|
|
+ @click="handleGetPolicyList"
|
|
|
+ >查询</el-button>
|
|
|
</div>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -368,9 +368,10 @@
|
|
|
>
|
|
|
<el-option v-for="item in policyList" :key="item.code" :label="item.title" :value="item.code">
|
|
|
<span>{{ item.title }}</span>
|
|
|
- <span v-if="item.policyRemark" style="margin-left: 15px; color: #f00; font-size: 12px"
|
|
|
- >（ {{ item.policyRemark }} ）</span
|
|
|
- >
|
|
|
+ <span
|
|
|
+ v-if="item.policyRemark"
|
|
|
+ style="margin-left: 15px; color: #f00; font-size: 12px"
|
|
|
+ >（ {{ item.policyRemark }} ）</span>
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
@@ -690,7 +691,8 @@ export default {
|
|
|
policyRemark: '',
|
|
|
policyId: '',
|
|
|
k3ServiceId: '',
|
|
|
- k3ServiceName: ''
|
|
|
+ k3ServiceName: '',
|
|
|
+ isAllDirect: false
|
|
|
},
|
|
|
// mainFormRules: {
|
|
|
// type: [{ required: true, message: "请选择品类", trigger: "change" }],
|
|
|
@@ -882,6 +884,11 @@ export default {
|
|
|
},
|
|
|
immediate: true,
|
|
|
deep: true
|
|
|
+ },
|
|
|
+ 'mainForm.isAllDirect'(e) {
|
|
|
+ this.goodsList.forEach(k => {
|
|
|
+ this.$set(k, 'isDirectTransfer', e)
|
|
|
+ })
|
|
|
}
|
|
|
},
|
|
|
|
|
|
@@ -1263,7 +1270,7 @@ export default {
|
|
|
* @param {String} index - 索引值
|
|
|
* @return Boolean
|
|
|
*/
|
|
|
- selectable: function (row, index) {
|
|
|
+ selectable: function(row, index) {
|
|
|
// row.disabled == undefined 才能被选中
|
|
|
if (row.disabled == undefined) {
|
|
|
return true
|
|
|
@@ -1279,7 +1286,7 @@ export default {
|
|
|
* @param {String} index - 索引值
|
|
|
* @return Boolean
|
|
|
*/
|
|
|
- selectable2: function (row, index) {
|
|
|
+ selectable2: function(row, index) {
|
|
|
// row.disabled == undefined 才能被选中
|
|
|
if (row.disabled == undefined) {
|
|
|
return true
|
|
|
@@ -1881,7 +1888,7 @@ export default {
|
|
|
this.goodsList.forEach(k => {
|
|
|
delete k.userList
|
|
|
})
|
|
|
- let hasCustomerWalletId = this.goodsList.find((k, i) => {
|
|
|
+ const hasCustomerWalletId = this.goodsList.find((k, i) => {
|
|
|
if (!k.customerWalletId) {
|
|
|
this.$errorMsg(`第${i + 1}货品没现金钱包`)
|
|
|
return true
|
zh