存在定制前端功能提交

src/api/hisStore/menu.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询用户端菜单管理列表
 export function listMenu(query) {
   return request({
-    url: '/store/store/store/menu/list',
+    url: '/store/store/menu/list',
     method: 'get',
     params: query
   })

src/views/hisStore/storeOrder/healthStoreList.vue

@@ -533,25 +533,25 @@
     >
       <span slot="footer" class="dialog-footer">
         <!-- 小程序Appid选择 -->
-<!--        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">-->
-<!--          <el-form-item label="小程序:" prop="miniAppId">-->
-<!--        <el-select-->
-<!--          v-model="ruleForm.miniAppId"-->
-<!--          clearable-->
-<!--          placeholder="请选择发货小程序"-->
-<!--          style="width: 100%"-->
-<!--        >-->
-<!--          <el-option-->
-<!--            v-for="item in miniAppList"-->
-<!--            :key="item.appId"-->
-<!--            :label="item.appName"-->
-<!--            :value="item.appId"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-<!--        </el-form>-->
+        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+          <el-form-item label="小程序:" prop="miniAppId">
+        <el-select
+          v-model="ruleForm.miniAppId"
+          clearable
+          placeholder="请选择发货小程序"
+          style="width: 100%"
+        >
+          <el-option
+            v-for="item in miniAppList"
+            :key="item.appId"
+            :label="item.appName"
+            :value="item.appId"
+          />
+        </el-select>
+      </el-form-item>
+        </el-form>
 
-        <el-upload ref="upload" :action="orderUpload.url" :auto-upload="false" :disabled="orderUpload.isUploading" :headers="orderUpload.headers"
+        <el-upload ref="upload" :action="uploadUrl" :auto-upload="false" :disabled="orderUpload.isUploading" :headers="orderUpload.headers"
                    :limit="1" :on-progress="handleFileUploadProgress"
                    :on-success="handleFileSuccess" accept=".xlsx, .xls" drag
         >
@@ -566,8 +566,8 @@
         <div slot="tip" class="el-upload__tip" style="color:red">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
       </el-upload>
         <el-divider></el-divider>
-        <el-button @click="deliveryNoteOpen = false">取 消</el-button>
-        <el-button type="primary" @click="submitDeliveryNote">确 定</el-button>
+        <el-button @click="cancelResetDeliveryNote">取 消</el-button>
+        <el-button type="primary" @click="submitDeliveryNote('ruleForm')">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -766,8 +766,6 @@ export default {
         updateSupport: 0,
         // 设置上传的请求头部
         headers: { Authorization: 'Bearer ' + getToken() },
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + '/store/store/storeOrder/importDeliveryNoteExpress',
       },
       deliveryNoteOpen: false,
       miniAppList: [],
@@ -776,6 +774,13 @@ export default {
       },
     }
   },
+  computed: {
+    uploadUrl() {
+      return process.env.VUE_APP_BASE_API +
+        '/store/store/storeOrder/importDeliveryNoteExpress?miniAppId=' +
+        this.ruleForm.miniAppId;
+    }
+  },
   created() {
     getCompanyList().then(response => {
       this.companys = response.data
@@ -1228,7 +1233,7 @@ export default {
     //打开发货单
     openDeliveryNote() {
       this.deliveryNoteOpen = true
-      // this.getAppList();
+      this.getAppList();
     },
     handleClose(done) {
       this.$confirm('确认关闭？')
@@ -1261,15 +1266,25 @@ export default {
       })
     },
     // 提交发货单
-    submitDeliveryNote() {
-      const uploadFiles = this.$refs.upload.uploadFiles;
-      if (uploadFiles.length === 0) {
-        this.$message.error('请选择要上传的文件');
-        return;
-      }
-      this.$refs.upload.submit();
+    submitDeliveryNote(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          const uploadFiles = this.$refs.upload.uploadFiles
+          if (uploadFiles.length === 0) {
+            this.$message.error('请选择要上传的文件')
+            return
+          }
+          this.$refs.upload.submit()
+        } else {
+          return false
+        }
+      })
+    },
+    //取消重置
+    cancelResetDeliveryNote(){
+      this.deliveryNoteOpen = false;
+      this.resetForm('ruleForm')
     }
-
   }
 }
 </script>

src/views/hisStore/storeProduct/index.vue

@@ -47,161 +47,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="所属店铺">
-        <el-select style="width: 240px" v-model="queryParams.storeIds" multiple placeholder="请选择店铺" clearable size="small" >
-          <el-option
-            v-for="item in storeOptions"
-            :key="item.storeId"
-            :label="item.storeName"
-            :value="item.storeId"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="审核状态">
-        <el-select style="width: 240px" v-model="queryParams.isAudit" placeholder="请选择审核状态" size="small" >
-          <el-option value="0" label="待审核" key="isAudit0">待审核</el-option>
-          <el-option value="1" label="审核通过" key="isAudit1">审核通过</el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="药品注册证书编号" prop="drugRegCertNo">
-        <el-input
-          v-model="queryParams.drugRegCertNo"
-          placeholder="请输入药品注册证书编号"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
-
-      <el-form-item label="通用名称" prop="commonName">
-        <el-input
-          v-model="queryParams.commonName"
-          placeholder="请输入通用名称"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
-
-      <el-form-item label="剂型" prop="dosageForm">
-        <el-input
-          v-model="queryParams.dosageForm"
-          placeholder="请输入剂型"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
-
-      <el-form-item label="单价" prop="unitPrice">
-        <el-input
-          v-model="queryParams.unitPrice"
-          placeholder="请输入单价"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
-
-      <el-form-item label="批号" prop="batchNumber">
-        <el-input
-          v-model="queryParams.batchNumber"
-          placeholder="请输入批号"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
-
-      <el-form-item label="上市许可持有人" prop="mah">
-        <el-input
-          v-model="queryParams.mah"
-          placeholder="请输入上市许可持有人"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
-
-      <el-form-item label="持有人地址" prop="mahAddress">
-        <el-input
-          v-model="queryParams.mahAddress"
-          placeholder="请输入持有人地址"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
-
-      <el-form-item label="生产企业" prop="manufacturer">
-        <el-input
-          v-model="queryParams.manufacturer"
-          placeholder="请输入生产企业"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
-
-      <el-form-item label="生产企业地址" prop="manufacturerAddress">
-        <el-input
-          v-model="queryParams.manufacturerAddress"
-          placeholder="请输入生产企业地址"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
-
-      <el-form-item label="功能主治" prop="indications">
-        <el-input
-          v-model="queryParams.indications"
-          placeholder="请输入功能主治"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
-
-      <el-form-item label="用法用量" prop="dosage">
-        <el-input
-          v-model="queryParams.dosage"
-          placeholder="请输入用法用量"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
-
-      <el-form-item label="不良反应" prop="adverseReactions">
-        <el-input
-          v-model="queryParams.adverseReactions"
-          placeholder="请输入不良反应"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
-
-      <el-form-item label="禁忌" prop="contraindications">
-        <el-input
-          v-model="queryParams.contraindications"
-          placeholder="请输入禁忌"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
-
-      <el-form-item label="注意事项" prop="precautions">
-        <el-input
-          v-model="queryParams.precautions"
-          placeholder="请输入注意事项"
-          clearable
-          size="small"
-
-        />
-      </el-form-item>
       <!-- <el-form-item label="状态" prop="isShow">
          <el-select style="width: 240px" v-model="queryParams.isShow" placeholder="请选择状态" clearable size="small" >
          <el-option
@@ -325,14 +170,6 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['store:storeProduct:edit']"
           >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="showOperLog(scope.row)"
-            v-hasPermi="['store:storeProduct:list']"
-            v-if="scope.row.isAudit===1"
-          >审核记录</el-button>
           <el-button
             size="mini"
             type="text"
@@ -424,109 +261,6 @@
           </el-col>
 
         </el-row>
-        <el-row :gutter="10">
-          <el-col :span="12">
-            <el-form-item label="是否药品" prop="isDrug">
-              <el-radio-group v-model="form.isDrug">
-                <el-radio
-                  v-for="item in isDrugOptions"
-                  :key="item.dictValue"
-                  :label="item.dictValue"
-                >{{ item.dictLabel }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <div v-if="form.isDrug === '1'">
-          <el-form-item label="药品展示图" prop="drugImage">
-            <Material v-model="drugImageArr" type="image" :num="1" :width="150" :height="150" />
-          </el-form-item>
-
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="药品注册证书编号" prop="drugRegCertNo">
-                <el-input v-model="form.drugRegCertNo" placeholder="请输入药品注册证书编号" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="通用名称" prop="commonName">
-                <el-input v-model="form.commonName" placeholder="请输入通用名称" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="剂型" prop="dosageForm">
-                <el-input v-model="form.dosageForm" placeholder="请输入剂型" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="单价" prop="unitPrice">
-                <el-input v-model="form.unitPrice" placeholder="请输入单价" type="number" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="批号" prop="batchNumber">
-                <el-input v-model="form.batchNumber" placeholder="请输入批号" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="规格" prop="prescribeSpec">
-                <el-input v-model="form.prescribeSpec" placeholder="请输入规格" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="上市许可持有人" prop="mah">
-                <el-input v-model="form.mah" placeholder="请输入上市许可持有人" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="持有人地址" prop="mahAddress">
-                <el-input v-model="form.mahAddress" placeholder="请输入上市许可持有人地址" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="生产企业" prop="manufacturer">
-                <el-input v-model="form.manufacturer" placeholder="请输入生产企业" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="企业地址" prop="manufacturerAddress">
-                <el-input v-model="form.manufacturerAddress" placeholder="请输入生产企业地址" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-form-item label="功能主治" prop="indications">
-            <el-input v-model="form.indications" type="textarea" placeholder="请输入功能主治" />
-          </el-form-item>
-
-          <el-form-item label="用法用量" prop="dosage">
-            <el-input v-model="form.dosage" type="textarea" placeholder="请输入用法用量" />
-          </el-form-item>
-
-          <el-form-item label="不良反应" prop="adverseReactions">
-            <el-input v-model="form.adverseReactions" type="textarea" placeholder="请输入不良反应" />
-          </el-form-item>
-
-          <el-form-item label="禁忌" prop="contraindications">
-            <el-input v-model="form.contraindications" type="textarea" placeholder="请输入禁忌" />
-          </el-form-item>
-
-          <el-form-item label="注意事项" prop="precautions">
-            <el-input v-model="form.precautions" type="textarea" placeholder="请输入注意事项" />
-          </el-form-item>
-        </div>
         <el-row>
           <el-col :span="24">
             <el-form-item label="商品简介" prop="productInfo">
@@ -626,13 +360,27 @@
                   <el-table :data="manyFormValidate" size="small" style="width: 90%;" border>
                     <el-table-column type="myindex" v-for="(item,index) in form.header" :key="index"  :width="item.minWidth" :label="item.title" :property="item.slot" align="center">
                       <template slot-scope="scope">
-                        <div v-if="scope.column.property == 'image'" align="center">
+                        <div v-if="scope.column.property === 'image'" align="center">
                           <single-img v-model="scope.row[scope.column.property]" type="image" :num="1" :width="60" :height="60" />
                         </div>
-                        <div v-else-if="scope.column.property.indexOf('value') != -1" align="center">
+                        <div v-else-if="scope.column.property === 'hasDepositFeature'" align="center">
+                          <el-switch
+                            v-model="scope.row[scope.column.property]"
+                            active-color="#13ce66"
+                            inactive-color="#ff4949"
+                            @change="(value) => handleDepositSwitchChange(value, scope.row)">
+                          </el-switch>
+                        </div>
+                        <div v-else-if="scope.column.property === 'depositAmount'">
+                          <el-input type="text" v-model="scope.row[scope.column.property]" :disabled="scope.row.hasDepositFeatureType === 0"/>
+                        </div>
+                        <div v-else-if="scope.column.property === 'onBehalfPaymentAmount'">
+                          <el-input type="text" v-model="scope.row[scope.column.property]" :disabled="scope.row.hasDepositFeatureType === 0"/>
+                        </div>
+                        <div v-else-if="scope.column.property.indexOf('value') !== -1" align="center">
                           {{ scope.row[scope.column.property] }}
                         </div>
-                        <div v-else-if="scope.column.property == 'action'" align="center" >
+                        <div v-else-if="scope.column.property === 'action'" align="center" >
                           <a @click="delAttrTable(scope.$index)" align="center">删除</a>
                         </div>
                         <div v-else align="center">
@@ -656,6 +404,26 @@
                     <single-img v-model="scope.row.image" type="image" :num="1" :width="60" :height="60" />
                   </template>
                 </el-table-column>
+                <el-table-column label="是否开启定金" align="center">
+                  <template v-slot="scope">
+                    <el-switch
+                      v-model="scope.row.hasDepositFeature"
+                      active-color="#13ce66"
+                      inactive-color="#ff4949"
+                      @change="(value) => handleDepositSwitchChange(value, scope.row)">
+                    </el-switch>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="depositAmount" label="定金金额" align="center">
+                  <template v-slot="scope">
+                    <el-input type="text" v-model="scope.row.depositAmount" :disabled="scope.row.hasDepositFeatureType === 0"/>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="onBehalfPaymentAmount" label="代付金额" align="center">
+                  <template v-slot="scope">
+                    <el-input type="text" v-model="scope.row.onBehalfPaymentAmount" :disabled="scope.row.hasDepositFeatureType === 0"/>
+                  </template>
+                </el-table-column>
                 <el-table-column prop="price" label="售价" align="center">
                   <template slot-scope="scope">
                     <el-input type="text" v-model="scope.row.price"/>
@@ -814,7 +582,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="商品类型" prop="productType">
-          <el-select style="width: 240px" v-model="form.productType" placeholder="请选择商品类型" clearable size="small">
+          <el-select style="width: 240px" v-model="form.productType" placeholder="请选择商品类型" clearable size="small" >
             <el-option
               v-for="item in productTypeOptions"
               :key="item.dictValue"
@@ -833,16 +601,6 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="所属店铺">
-          <el-select style="width: 240px" v-model="form.storeId" placeholder="请选择店铺" clearable size="small" >
-            <el-option
-              v-for="item in storeOptions"
-              :key="item.storeId"
-              :label="item.storeName"
-              :value="item.storeId"
-            />
-          </el-select>
-        </el-form-item>
         <el-form-item label="国药准字" v-if="form.productType==2" prop="prescribeCode">
           <el-input v-model="form.prescribeCode" placeholder="请输入国药准字" />
         </el-form-item>
@@ -914,7 +672,6 @@ import Editor from '@/components/Editor/wang';
 import Material from '@/components/Material'
 import singleImg from '@/components/Material/single'
 import { getCompanyList } from "@/api/company/company";
-import { listStore } from '@/api/hisStore/store'
 export default {
   name: "HisStoreProduct",
   components: {
@@ -929,16 +686,11 @@ export default {
     },
     photoArr: function(val) {
       this.form.sliderImage = val.join(',')
-    },
-    drugImageArr: function(val) {
-      this.form.drugImage = val.join(',');
     }
   },
   data() {
     return {
       companyId: null,
-      storeId: null,
-      isAudit: null,
       uploadUrl:process.env.VUE_APP_BASE_API+"/common/uploadOSS",
       //videoAccept:"video/*",
       upload: {
@@ -955,15 +707,6 @@ export default {
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + "/store/storeProduct/importData"
       },
-      // 添加药品相关字段
-      isDrugOptions: [
-        { dictValue: "0", dictLabel: "否" },
-        { dictValue: "1", dictLabel: "是" }
-      ],
-
-      // 药品展示图
-      drugImageArr: [],
-
       productTuiCateOptions:[],
       showIput: false,
       createBnt:true,
@@ -985,6 +728,10 @@ export default {
       oneFormValidate: [
         {
           image: '',
+          hasDepositFeature:false,
+          hasDepositFeatureType: 0,//开启类型
+          depositAmount:0,//定金金额
+          onBehalfPaymentAmount:0,//代付金额
           price: 0,
           cost: 0,
           agentPrice: 0,
@@ -1009,7 +756,6 @@ export default {
       categoryOptions:[],
       // 企业列表
       companyOptions:[],
-      storeOptions:[],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -1038,22 +784,7 @@ export default {
         productType: null,
         isShow: "1",
         barCode:null,
-        companyIds: null,
-        storeIds: null,
-        drugRegCertNo: null,
-        commonName: null,
-        dosageForm: null,
-        unitPrice: null,
-        batchNumber: null,
-        mah: null,
-        mahAddress: null,
-        manufacturer: null,
-        manufacturerAddress: null,
-        indications: null,
-        dosage: null,
-        adverseReactions: null,
-        contraindications: null,
-        precautions: null
+        companyIds: null
       },
       // 表单参数
       form: {},
@@ -1098,55 +829,6 @@ export default {
         companyIds: [
           { required: true, message: "销售公司不能为空", trigger: "blur" }
         ],
-        // 药品相关字段校验（仅在是药品时必填）
-        drugImage: [
-          { required: true, message: "药品展示图不能为空", trigger: "blur" }
-        ],
-        drugRegCertNo: [
-          { required: true, message: "药品注册证书编号不能为空", trigger: "blur" }
-        ],
-        commonName: [
-          { required: true, message: "通用名称不能为空", trigger: "blur" }
-        ],
-        dosageForm: [
-          { required: true, message: "剂型不能为空", trigger: "blur" }
-        ],
-        unitPrice: [
-          { required: true, message: "单价不能为空", trigger: "blur" }
-        ],
-        batchNumber: [
-          { required: true, message: "批号不能为空", trigger: "blur" }
-        ],
-        mah: [
-          { required: true, message: "上市许可持有人不能为空", trigger: "blur" }
-        ],
-        mahAddress: [
-          { required: true, message: "上市许可持有人地址不能为空", trigger: "blur" }
-        ],
-        manufacturer: [
-          { required: true, message: "生产企业不能为空", trigger: "blur" }
-        ],
-        manufacturerAddress: [
-          { required: true, message: "生产企业地址不能为空", trigger: "blur" }
-        ],
-        indications: [
-          { required: true, message: "功能主治不能为空", trigger: "blur" }
-        ],
-        dosage: [
-          { required: true, message: "用法用量不能为空", trigger: "blur" }
-        ],
-        adverseReactions: [
-          { required: true, message: "不良反应不能为空", trigger: "blur" }
-        ],
-        contraindications: [
-          { required: true, message: "禁忌不能为空", trigger: "blur" }
-        ],
-        precautions: [
-          { required: true, message: "注意事项不能为空", trigger: "blur" }
-        ],
-        storeId :[
-          { required: true, message: "所属店铺不能为空", trigger: "blur"}
-        ]
       }
     };
   },
@@ -1177,9 +859,6 @@ export default {
     getCompanyList().then(response => {
       this.companyOptions = response.data;
     });
-    listStore().then(response => {
-      this.storeOptions = response.rows;
-    });
     this.getTreeselect();
     this.getList();
   },
@@ -1399,7 +1078,6 @@ export default {
     /** 查询商品列表 */
     getList() {
       this.loading = true;
-      console.log(this.queryParams)
       listStoreProduct(this.queryParams).then(response => {
         this.storeProductList = response.rows;
         this.total = response.total;
@@ -1414,7 +1092,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        productId: null,
+        productId: 0,
         image: null,
         video: null,
         sliderImage: null,
@@ -1456,30 +1134,16 @@ export default {
         prescribeFactory: null,
         prescribeName: null,
         isDisplay:"1",
-        companyIds:[],
-        isDrug: "1", // 是否药品
-        drugImage: null, // 药品展示图
-        drugRegCertNo: null, // 药品注册证书编号
-        commonName: null, // 通用名称
-        dosageForm: null, // 剂型
-        unitPrice: null, // 单价
-        batchNumber: null, // 批号
-        mah: null, // 上市许可持有人
-        mahAddress: null, // 上市许可持有人地址
-        manufacturer: null, // 生产企业
-        manufacturerAddress: null, // 生产企业地址
-        indications: null, // 功能主治
-        dosage: null, // 用法用量
-        adverseReactions: null, // 不良反应
-        contraindications: null, // 禁忌
-        precautions: null // 注意事项
+        companyIds:[]
       };
-      // 重置药品展示图
-      this.drugImageArr = [];
       this.resetForm("form");
       this.oneFormValidate = [
         {
           image: '',
+          hasDepositFeature:false,
+          hasDepositFeatureType: 0,//开启类型
+          depositAmount:0,//定金金额
+          onBehalfPaymentAmount:0,//代付金额
           price: 0,
           agentPrice: 0,
           cost: 0,
@@ -1547,12 +1211,6 @@ export default {
         if(this.form.tuiCateId!=null){
           this.form.tuiCateId = response.data.tuiCateId.toString();
         }
-
-        this.form.isDrug = response.data.isDrug ? response.data.isDrug.toString() : "1";
-        if (this.form.drugImage != null) {
-          this.drugImageArr = this.form.drugImage.split(",");
-        }
-
         //组装attrs数据
         if(response.attrs!=null){
           this.attrs=[];
@@ -1575,6 +1233,10 @@ export default {
           that.oneFormValidate = [
             {
               image: '',
+              hasDepositFeature:false,
+              hasDepositFeatureType: 0,//开启类型
+              depositAmount:0,//定金金额
+              onBehalfPaymentAmount:0,//代付金额
               price: 0,
               agentPrice: 0,
               cost: 0,
@@ -1619,6 +1281,29 @@ export default {
             this.form.items = this.attrs;
             this.form.values = this.manyFormValidate;
           }
+
+          const hasError = this.form.values.some(v => {
+            if (v.hasDepositFeatureType === 1) {
+              let  depositAmount =Number(v.depositAmount);
+              let onBehalfPaymentAmount=Number(v.onBehalfPaymentAmount);
+              if (depositAmount < 1) {
+                this.$message.warning('数据提交失败，当前商品已开启定金，定金金额不能小于1！');
+                return true;
+              } else if (onBehalfPaymentAmount < 1) {
+                this.$message.warning('数据提交失败，当前商品已开启定金，代付金额不能小于1！');
+                return true;
+              } else if ((depositAmount + onBehalfPaymentAmount) !== Number(v.price)) {
+                this.$message.warning('数据提交失败，当前商品已开启定金，商品定金和代付总和要与售价相等！');
+                return true;
+              }
+            }
+            return false;
+          });
+
+          if (hasError) {
+            return;
+          }
+
           if(this.form.specType === 1 && this.manyFormValidate.length===0){
             return this.$message.warning('请点击生成规格！');
           }
@@ -1662,6 +1347,14 @@ export default {
       }).then(response => {
         this.download(response.msg);
       }).catch(function() {});
+    },
+    //是否开启定金开启方法
+    handleDepositSwitchChange(value, row){
+      if(value){
+        row.hasDepositFeatureType = 1;
+      }else {
+        row.hasDepositFeatureType = 0;
+      }
     }
   }
 };

src/views/system/config/config.vue

@@ -1041,8 +1041,14 @@
                 </el-form-item>
                 <el-form-item  label="汇付大额退款回调地址" prop="hfOnlineRefundNotifyUrl">
                     <el-input  v-model="form17.hfOnlineRefundNotifyUrl" label="汇付大额退款回调地址"></el-input>
-                </el-form-item>-->
-
+                </el-form-item>
+                <el-form-item label="是否开启刷单" prop="isBrushOrders">
+                  <el-switch
+                    v-model="form17.isBrushOrders"
+                    active-color="#13ce66"
+                    inactive-color="#ff4949">
+                  </el-switch>
+                </el-form-item>
         <div class="footer">
           <el-button type="primary" @click="submitForm17">提  交</el-button>
         </div>