Merge remote-tracking branch 'origin/master_bly' into master_bly

src/api/hisStore/storePayment.js

@@ -76,3 +76,12 @@ export function setPayNotify(data) {
     data: data
   })
 }
+
+//同步订单状态
+export function oneClickShipping(data) {
+  return request({
+    url: '/store/store/storePayment/oneClickShipping',
+    method: 'post',
+    data: data
+  })
+}

src/views/his/company/index.vue

@@ -111,6 +111,7 @@
       </el-table-column>
 
       <el-table-column label="余额" align="center" prop="money"/>
+      <el-table-column label="红包余额" align="center" prop="redPackageMoney"/>
       <el-table-column label="企业类型" align="center" prop="companyType">
         <template slot-scope="scope">
           <dict-tag :options="companyTypeOptions" :value="scope.row.companyType"/>
@@ -184,7 +185,31 @@
             v-hasPermi="['his:company:deduct']"
           >扣款
           </el-button>
-
+          <el-button
+            v-if="showRedPacket"
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleRedRecharge(scope.row)"
+            v-hasPermi="['his:company:redRecharge']"
+          >红包充值
+          </el-button>
+          <el-button
+            v-if="showRedPacket"
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleRedDeduct(scope.row)"
+            v-hasPermi="['his:company:redDeduct']"
+          >红包扣款
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleRevenue(scope.row)"
+            v-hasPermi="['company:company:revenue']"
+          >分账配置</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -496,6 +521,27 @@
       </div>
     </el-dialog>
 
+    <el-dialog :title="redRecharge.title" :visible.sync="redRecharge.open" width="500px" append-to-body>
+      <el-form ref="redRechargeForm" :rules="redRechargeRules" :model="redRechargeForm" label-width="80px">
+        <el-form-item label="公司">
+          <el-input v-model="redRechargeForm.companyName" disabled/>
+        </el-form-item>
+        <el-form-item label="余额">
+          <el-input v-model="redRechargeForm.balance" disabled/>
+        </el-form-item>
+        <el-form-item label="充值金额" prop="money">
+          <el-input-number v-model="redRechargeForm.money" :min="0.01" placeholder="请输入充值金额"/>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="redRechargeForm.remark" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitRedRechargeForm" :disabled="redSubmit">确 定</el-button>
+        <el-button @click="redRecharge.open=false">取 消</el-button>
+      </div>
+    </el-dialog>
+
     <el-dialog :title="deduct.title" :visible.sync="deduct.open" width="500px" append-to-body>
       <el-form ref="deductForm" :rules="deductRules" :model="deductForm" label-width="80px">
         <el-form-item label="公司">
@@ -516,6 +562,183 @@
         <el-button @click="deduct.open=false">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :title="redDeduct.title" :visible.sync="redDeduct.open" width="500px" append-to-body>
+      <el-form ref="redDeductForm" :rules="redDeductRules" :model="redDeductForm" label-width="80px">
+        <el-form-item label="公司">
+          <el-input v-model="redDeductForm.companyName" disabled/>
+        </el-form-item>
+        <el-form-item label="余额">
+          <el-input v-model="redDeductForm.balance" disabled/>
+        </el-form-item>
+        <el-form-item label="扣款金额" prop="money">
+          <el-input-number v-model="redDeductForm.money" :min="0.01" placeholder="请输入扣款金额"/>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="redDeductForm.remark" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitRedDeductForm">确 定</el-button>
+        <el-button @click="redDeduct.open=false">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :title="revenue.title" :visible.sync="revenue.open" width="800px" append-to-body>
+      <el-form ref="revenueForm"  :model="revenueForm" label-width="150px">
+        <el-form-item label="公司">
+          <el-input v-model="revenueForm.companyName" disabled/>
+        </el-form-item>
+
+        <el-form-item label="开启分账">
+          <el-switch
+            v-model="revenueForm.divFlag"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            active-value="1"
+            inactive-value="0"
+          >
+          </el-switch>
+        </el-form-item>
+
+        <el-form-item label="分账模式" v-if="revenueForm.divFlag == 1">
+          <el-radio v-model="revenueForm.delayAcctFlag" label="N">实时分账</el-radio>
+          <el-radio v-model="revenueForm.delayAcctFlag" label="Y">延时分账</el-radio>
+        </el-form-item>
+        <el-form-item label="是否使用百分比分账" v-if="revenueForm.divFlag == 1">
+          <el-switch
+            v-model="revenueForm.percentageFlag"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            active-value="Y"
+            inactive-value="N"
+          >
+          </el-switch>
+        </el-form-item>
+        <el-form-item label="是否净值分账" v-if="revenueForm.percentageFlag == 'Y'">
+          <el-switch
+            v-model="revenueForm.iscCleanSplit"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            active-value="Y"
+            inactive-value="N"
+          >
+          </el-switch>
+        </el-form-item>
+        <div v-if="revenueForm.divFlag == 1">
+            <el-form-item label="分账接收方配置">
+              <el-tooltip content="批量设置分账接收账户" placement="top">
+                <el-button type="primary" icon="el-icon-plus" @click="addAcctInfo" style="margin-bottom: 5px;">
+                  添加新接收方
+                </el-button>
+              </el-tooltip>
+
+            </el-form-item>
+
+            <div v-for="(account, index) in revenueForm.acctInfos" :key="index"
+                 style="border: 1px solid #dcdfe6; padding: 20px; margin-bottom: 20px; border-radius: 4px;"
+            >
+              <div style="display: flex; justify-content: between; align-items: center; margin-bottom: 15px;">
+                <div style="margin: 0; color: #409eff;">账户 {{ index + 1 }}</div>
+                <el-button
+                  type="danger"
+                  icon="el-icon-delete"
+                  size="mini"
+                  @click="removeAcctInfo(index)"
+                  v-if="revenueForm.acctInfos.length > 0"
+                >
+                  删除账户
+                </el-button>
+              </div>
+
+              <el-form-item label="分账接收方ID" :prop="`acctInfos.${index}.huifuId`">
+                <el-input v-model="account.huifuId"   placeholder="斗拱开户时生成；示例值：6666000123120001"></el-input>
+              </el-form-item>
+              <el-form-item label="账户号" :prop="`acctInfos.${index}.acctId`" >
+                <el-input v-model="account.acctId"  placeholder="可指定账户号，仅支持基本户、现金户，不填默认为基本户；示例值：F00598600"></el-input>
+              </el-form-item>
+
+              <el-form-item label="分账百分比%" v-if="revenueForm.percentageFlag == 'Y'" :prop="`acctInfos.${index}.percentageDiv`"  >
+                <el-input-number v-model="account.percentageDiv" :precision="2" :step="0.1" :min="0" :max="100" placeholder="示例值：23.50，表示23.50%。acct_infos中全部分账百分比之和必须为100.00%。"></el-input-number>
+              </el-form-item>
+              <el-form-item label="分账金额" v-if="revenueForm.percentageFlag == 'N'" :prop="`acctInfos.${index}.divAmt`"  >
+                <el-input-number v-model="account.divAmt" :precision="2" :step="1" :min="0.01" placeholder="单位元，需保留小数点后两位，示例值：1.00 ，最低传入0.01"></el-input-number>
+              </el-form-item>
+
+            </div>
+          </div>
+
+
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitRevenueForm">确 定</el-button>
+        <el-button @click="revenue.open=false">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 批量修改小程序 -->
+    <el-dialog :title="miniProgram.title" :visible.sync="miniProgram.open" width="700px" append-to-body>
+
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="小程序点播配置" prop="courseMiniAppId">
+          <el-select
+            v-model="form.courseMiniAppId"
+            placeholder="请选择小程序"
+            clearable
+            size="small"
+          >
+            <el-option
+              v-for="item in miniAppList"
+              :key="item.appId"
+              :label="item.appName"
+              :value="item.appId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="主要小程序" prop="miniAppMaster">
+          <el-select
+            v-model="form.miniAppMaster"
+            multiple
+            :multiple-limit="1"
+            placeholder="请选择"
+            clearable
+            size="small"
+          >
+            <el-option
+              v-for="item in miniAppList"
+              :key="item.appId"
+              :label="item.appName"
+              :value="item.appId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备用小程序" prop="miniAppServer">
+          <el-select
+            v-model="form.miniAppServer"
+            multiple
+            :multiple-limit="1"
+            placeholder="请选择"
+            clearable
+            size="small"
+          >
+            <el-option
+              v-for="item in miniAppList"
+              :key="item.appId"
+              :label="item.appName"
+              :value="item.appId"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitMiniProgramForm">确 定</el-button>
+        <el-button @click="cancelMiniProgram">取 消</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -527,9 +750,13 @@ import {
   addCompany,
   updateCompany,
   recharge,
+  redRecharge,
   deduct,
+  redDeduct,
   exportCompany,
-  resetPwd
+  resetPwd,
+  getDivConfig,
+  setDiv, exitMiniProgram
 } from '@/api/his/company'
 import {bindShopCompany} from "@/api/company/company";
 import { storeList } from '@/api/hisStore/store'
@@ -546,6 +773,16 @@ export default {
   name: 'Company',
   data() {
     return {
+      signProjectName:"",
+      redSubmit: false,
+      //分账参数
+      revenue:{
+        open: false,
+        title: '分账配置'
+      },
+      revenueForm:{
+        acctInfos: []
+      },
       shopList: [], // 清空店铺列表
       // 绑定店铺相关
       bindShopForm: {
@@ -568,12 +805,21 @@ export default {
       deductForm: {
         money: 0
       },
+      // 表单参数
+      redDeductForm: {
+        money: 0
+      },
       doctorIds: [],
       doctor: [],
       recharge: {
         open: false,
         title: '后台充值'
       },
+      redRecharge: {
+        open: false,
+        title: '红包充值'
+      },
+      showRedPacket: false,
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -616,6 +862,10 @@ export default {
       rechargeForm: {
         money: 0
       },
+      // 红包充值表单参数
+      redRechargeForm: {
+        money: 0
+      },
       followDoctorList: [],
       cateList: [],
       // 表单参数
@@ -687,18 +937,38 @@ export default {
           { required: true, message: '扣款金额不能为空', trigger: 'blur' }
         ]
       },
+      // 表单校验
+      redDeductRules: {
+        money: [
+          { required: true, message: '扣款金额不能为空', trigger: 'blur' }
+        ]
+      },
       rechargeRules: {
         money: [
           { required: true, message: '扣款金额不能为空', trigger: 'blur' }
         ]
       },
+      redRechargeRules: {
+        money: [
+          { required: true, message: '扣款金额不能为空', trigger: 'blur' }
+        ]
+      },
       deduct: {
         open: false,
         title: '后台扣款'
       },
+      redDeduct: {
+        open: false,
+        title: '红包扣款'
+      },
       maAppList: [],
       miniAppList: [],
-      customAppList: []
+      customAppList: [],
+      //分账参数
+      miniProgram:{
+        open: false,
+        title: '批量修改小程序'
+      },
     }
   },
   created() {
@@ -722,18 +992,65 @@ export default {
     listDept().then(response => {
       this.deptOptions = response.data
     })
-    // getConfigByKey("courseMa.config").then(response => {
-    //   if(response.data && response.data.configValue) {
-    //     this.miniAppList = JSON.parse(response.data.configValue);
-    //   } else {
-    //     this.miniAppList = [];
-    //   }
-    // });
+    getConfigByKey("course.config").then(response => {
+      if(response.data && response.data.configValue) {
+        const  config = JSON.parse(response.data.configValue);
+        if( config.isRedPackageBalanceDeduction && config.isRedPackageBalanceDeduction==1){
+          this.showRedPacket=true
+        }
+      } else {
+        this.showRedPacket = false;
+      }
+    });
     docList().then(response => {
       this.doctor = response.rows
     })
   },
   methods: {
+    // 添加分账账户
+    addAcctInfo() {
+      console.log("-----------------",this.revenueForm)
+      this.revenueForm.acctInfos.push({
+        huifuId: '',
+        acctId: '',
+        percentageDiv: null,
+        divAmt: null
+      })
+    },
+    // 删除接收方账户
+    removeAcctInfo(index) {
+      this.$confirm('确认删除该接收方账户?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.revenueForm.acctInfos.splice(index, 1)
+        this.$message.success('删除成功')
+      }).catch(() => {
+      })
+    },
+    handleRevenue(row){
+      const companyId = row.companyId
+      //查询配置
+      this.revenueForm.isAdd = 1
+      getDivConfig(companyId).then(response => {
+        if(response.data){
+          this.revenueForm = response.data
+          if(response.data.acctInfos == null){
+            this.revenueForm.acctInfos = []
+          }
+          if(response.data.divFlag){
+            this.revenueForm.divFlag = String(response.data.divFlag)
+          }
+        }
+      })
+      this.revenueForm.companyId = companyId
+      this.revenueForm.companyName = row.companyName
+      if(row.divFlag){
+        this.revenueForm.divFlag == "0"
+      }
+      this.revenue.open = true
+    },
 
     /** 店铺选择变化 */
     handleShopChange(shopId) {
@@ -801,6 +1118,15 @@ export default {
       this.rechargeForm.money = null
       this.recharge.open = true
     },
+    // 红包充值
+    handleRedRecharge(row) {
+      this.redSubmit=false
+      this.redRechargeForm.companyId = row.companyId
+      this.redRechargeForm.companyName = row.companyName
+      this.redRechargeForm.balance = row.redPackageMoney
+      this.redRechargeForm.money = null
+      this.redRecharge.open = true
+    },
     handleDeduct(row) {
       const companyId = row.companyId
       this.deductForm.companyId = row.companyId
@@ -809,6 +1135,13 @@ export default {
       this.deductForm.money = null
       this.deduct.open = true
     },
+    handleRedDeduct(row) {
+      this.redDeductForm.companyId = row.companyId
+      this.redDeductForm.companyName = row.companyName
+      this.redDeductForm.balance = row.redPackageMoney
+      this.redDeductForm.money = null
+      this.redDeduct.open = true
+    },
     /** 提交按钮 */
     submitRechargeForm() {
       this.$refs['rechargeForm'].validate(valid => {
@@ -823,6 +1156,35 @@ export default {
         }
       })
     },
+    /** 红包充值提交按钮 */
+    submitRedRechargeForm() {
+      this.$refs['redRechargeForm'].validate(valid => {
+        if (valid) {
+          this.redSubmit=true
+          redRecharge(this.redRechargeForm).then(response => {
+            if (response.code === 200) {
+              this.msgSuccess(response.msg)
+              this.redRecharge.open = false
+              this.getList()
+            }
+          })
+        }
+      })
+    },
+    submitRevenueForm(){
+      var param = this.revenueForm;
+      console.log("--------------",param)
+      if(param.companyId && param.divFlag){
+        setDiv(param).then(response => {
+            if (response.code === 200) {
+              this.msgSuccess(response.msg)
+              this.revenue.open = false
+              this.getList()
+            }
+          })
+        console.log("--------------",param)
+      }
+    },
     /** 提交按钮 */
     submitDeductForm() {
       this.$refs['deductForm'].validate(valid => {
@@ -837,6 +1199,20 @@ export default {
         }
       })
     },
+    /** 提交按钮 */
+    submitRedDeductForm() {
+      this.$refs['redDeductForm'].validate(valid => {
+        if (valid) {
+          redDeduct(this.redDeductForm).then(response => {
+            if (response.code === 200) {
+              this.msgSuccess(response.msg)
+              this.redDeduct.open = false
+              this.getList()
+            }
+          })
+        }
+      })
+    },
 
     getList() {
       this.loading = true
@@ -870,6 +1246,7 @@ export default {
         groupName: null,
         userId: null,
         remark: null,
+        isOpenRestReminder: null,
         linkName: null,
         limitUserCount: null,
         maxPadNum: -1,

src/views/his/user/index.vue

@@ -200,7 +200,7 @@
         <!--  会员等级      -->
         <el-form-item label="会员等级" prop="level">
           <el-select v-model="form.level" placeholder="请选择会员等级" clearable size="small">
-            <el-option
+            <el-option disabled
               v-for="dict in userLevelOptions"
               :key="dict.dictValue"
               :label="dict.dictLabel"

src/views/hisStore/components/productOrder.vue

@@ -689,6 +689,7 @@ export default {
       });
     },
     showExpress(){
+      this.traces=null;
       this.expressDialog.open=true;
       getExpress(this.orderId).then(response => {
           this.express = response.data;

src/views/hisStore/storePayment/index.vue

@@ -127,6 +127,16 @@
               />
         </el-select>
       </el-form-item>
+      <el-form-item label="小程序" prop="appId">
+        <el-select v-model="queryParams.appId" placeholder="请选择所属小程序" clearable size="small">
+          <el-option
+            v-for="dict in appMallOptions"
+            :key="dict.appid"
+            :label="dict.name + '(' + dict.appid + ')'"
+            :value="dict.appid"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -150,6 +160,15 @@
           @click="handlePayNotify"
           v-hasPermi="['store:storePayment:payNotify']"
         >同步订单状态</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          icon="el-icon-s-order"
+          size="mini"
+          type="success"
+          @click="wxOneClickShipping"
+        >微信一键线下自提发货
+        </el-button>
       </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -177,6 +196,7 @@
       <el-table-column label="所属公司" align="center" prop="companyName" />
       <el-table-column label="所属部门" align="center" prop="deptName" />
       <el-table-column label="员工" align="center" prop="companyUserNickName" />
+      <el-table-column label="小程序名称" align="center" prop="miniProgramName" width="120px" />
       <el-table-column label="状态" align="center" prop="status" >
           <template slot-scope="scope">
               <el-tag prop="status" v-for="(item, index) in statusOptions"    v-if="scope.row.status==item.dictValue">{{item.dictLabel}}</el-tag>
@@ -275,12 +295,13 @@
 </template>
 
 <script>
-import { refundStorePayment,listStorePayment, getStorePayment, delStorePayment, addStorePayment, updateStorePayment, exportStorePayment,setPayNotify } from "@/api/hisStore/storePayment";
+import { refundStorePayment,listStorePayment, getStorePayment, delStorePayment, addStorePayment, updateStorePayment, exportStorePayment,setPayNotify, oneClickShipping} from "@/api/hisStore/storePayment";
 import { getCompanyList } from "@/api/company/company";
 export default {
   name: "HisStorePayment",
   data() {
     return {
+      appMallOptions:[],
       payModeOptions:[
         { dictLabel: "微信支付", dictValue: "wx" },
         { dictLabel: "汇付", dictValue: "hf" }
@@ -350,6 +371,7 @@ export default {
         deptId: null,
         bankTransactionId:null,
         companyUserNickName:null,
+        appId:null,
       },
       // 表单参数
       form: {},
@@ -367,8 +389,16 @@ export default {
         this.companys = response.data;
       });
     this.getList();
+    // 获取小程序选项列表
+    this.getAppMallOptions();
   },
   methods: {
+    // 获取小程序选项列表
+    getAppMallOptions() {
+      getAppMallOptions({pageNum:1,pageSize:100,isMall:1}).then(response => {
+        this.appMallOptions = response.rows;
+      })
+    },
     submitPayNotifyForm(){
       this.$refs["payNotifyForm"].validate(valid => {
         if (valid) {
@@ -473,6 +503,9 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.dateRange=[];
+      this.refundDateRange=[];
+      this.createTimeRange=[];
       this.resetForm("queryForm");
       this.handleQuery();
     },
@@ -548,6 +581,21 @@ export default {
         }).then(response => {
           this.download(response.msg);
         }).catch(function() {});
+    },
+    wxOneClickShipping(){
+      this.$confirm('是否同步微信线下发货?', '一键发货', {
+        confirmButtonText: '是',
+        cancelButtonText: '否',
+        type: 'warning'
+      }).then(() => {
+        oneClickShipping().then(response => {
+          if(response.code === 200) {
+            this.$message.success("操作成功！")
+            this.getList();
+          }
+        })
+      }).catch(() => {
+      });
     }
   }
 };

src/views/system/config/config.vue

@@ -784,11 +784,12 @@
       </el-form-item>
       <el-form-item   label="erp类型" v-if="form13.erpOpen == 1">
         <el-radio v-model="form13.erpType" label=1>管易</el-radio>
-        <el-radio v-model="form13.erpType" label=2>旺店通</el-radio>
+        <el-radio v-model="form13.erpType" label=2>旺店通(企业版)</el-radio>
         <el-radio v-model="form13.erpType" label=3>瀚智OMS</el-radio>
         <el-radio v-model="form13.erpType" label=4>代服管家</el-radio>
         <el-radio v-model="form13.erpType" label=5>聚水潭</el-radio>
         <el-radio v-model="form13.erpType" label=6>金博</el-radio>
+        <el-radio v-model="form13.erpType" label=7>旺店通(旗舰版)</el-radio>
       </el-form-item>
      <el-form-item   label="不推送erp的公司" v-if="form13.erpOpen == 1">
        <el-select filterable v-model="form13.noErpCompany" placeholder="请选公司" multiple clearable size="small"
@@ -816,22 +817,23 @@
       <el-form-item   label="erpShopCode" v-if="form13.erpOpen == 1 && form13.erpType == 1 " prop="erpShopCode">
           <el-input   v-model="form13.erpShopCode"  label="请输入erpShopCode"></el-input>
       </el-form-item>
-      <el-form-item   label="erpWdAppKey" v-if="form13.erpOpen == 1 && form13.erpType == 2 " prop="erpWdAppKey">
+
+      <el-form-item   label="erpWdAppKey" v-if="form13.erpOpen == 1 && (form13.erpType == 2 || form13.erpType == 7) " prop="erpWdAppKey">
         <el-input   v-model="form13.erpWdAppKey"  label="请输入erpAppKey"></el-input>
       </el-form-item>
-      <el-form-item   label="erpWdAppsecret" v-if="form13.erpOpen == 1 && form13.erpType == 2 " prop="erpWdAppsecret">
+      <el-form-item   label="erpWdAppsecret" v-if="form13.erpOpen == 1 && (form13.erpType == 2 || form13.erpType == 7) " prop="erpWdAppsecret">
         <el-input   v-model="form13.erpWdAppsecret"  label="erpWdAppsecret"></el-input>
       </el-form-item>
-      <el-form-item   label="erpWdSid" v-if="form13.erpOpen == 1 && form13.erpType == 2 " prop="erpWdSid">
+      <el-form-item   label="erpWdSid" v-if="form13.erpOpen == 1 && (form13.erpType == 2 || form13.erpType == 7) " prop="erpWdSid">
         <el-input   v-model="form13.erpWdSid"  label="请输入erpWdSid"></el-input>
       </el-form-item>
-      <el-form-item   label="erpWdShopCode" v-if="form13.erpOpen == 1 && form13.erpType == 2 " prop="erpWdShopCode">
+      <el-form-item   label="erpWdShopCode" v-if="form13.erpOpen == 1 && (form13.erpType == 2 || form13.erpType == 7) " prop="erpWdShopCode">
         <el-input   v-model="form13.erpWdShopCode"  label="请输入erpWdShopCode"></el-input>
       </el-form-item>
-      <el-form-item   label="erpWdBaseUrl" v-if="form13.erpOpen == 1 && form13.erpType == 2 " prop="erpWdBaseUrl">
+      <el-form-item   label="erpWdBaseUrl" v-if="form13.erpOpen == 1 && (form13.erpType == 2 || form13.erpType == 7) " prop="erpWdBaseUrl">
         <el-input   v-model="form13.erpWdBaseUrl"  label="请输入erpWdBaseUrl"></el-input>
       </el-form-item>
-      <el-form-item   label="erpWarehouseCode" v-if="form13.erpOpen == 1 && form13.erpType == 2 " prop="erpWarehouseCode">
+      <el-form-item   label="erpWarehouseCode" v-if="form13.erpOpen == 1 && (form13.erpType == 2 || form13.erpType == 7) " prop="erpWarehouseCode">
         <el-input   v-model="form13.erpWarehouseCode"  label="请输入erpWarehouseCode"></el-input>
       </el-form-item>
       <!-- erpHzOMSid -->
@@ -909,24 +911,6 @@
       </div>
 
 
-          <el-form-item   label="erpWdAppKey" v-if="form13.erpOpen == 1 && form13.erpType == 2 " prop="erpWdAppKey">
-            <el-input   v-model="form13.erpWdAppKey"  label="请输入erpAppKey"></el-input>
-          </el-form-item>
-          <el-form-item   label="erpWdAppsecret" v-if="form13.erpOpen == 1 && form13.erpType == 2 " prop="erpWdAppsecret">
-            <el-input   v-model="form13.erpWdAppsecret"  label="erpWdAppsecret"></el-input>
-          </el-form-item>
-          <el-form-item   label="erpWdSid" v-if="form13.erpOpen == 1 && form13.erpType == 2 " prop="erpWdSid">
-            <el-input   v-model="form13.erpWdSid"  label="请输入erpWdSid"></el-input>
-          </el-form-item>
-          <el-form-item   label="erpWdShopCode" v-if="form13.erpOpen == 1 && form13.erpType == 2 " prop="erpWdShopCode">
-            <el-input   v-model="form13.erpWdShopCode"  label="请输入erpWdShopCode"></el-input>
-          </el-form-item>
-          <el-form-item   label="erpWdBaseUrl" v-if="form13.erpOpen == 1 && form13.erpType == 2 " prop="erpWdBaseUrl">
-            <el-input   v-model="form13.erpWdBaseUrl"  label="请输入erpWdBaseUrl"></el-input>
-          </el-form-item>
-          <el-form-item   label="erpWarehouseCode" v-if="form13.erpOpen == 1 && form13.erpType == 2 " prop="erpWarehouseCode">
-            <el-input   v-model="form13.erpWarehouseCode"  label="请输入erpWarehouseCode"></el-input>
-          </el-form-item>
 
           <el-form-item   label="erpHzOMSAppKey" v-if="form13.erpOpen == 1 && form13.erpType == 3 " prop="erpHzOMSAppKey">
             <el-input   v-model="form13.erpHzOMSAppKey"  label="请输入erpAppKey"></el-input>
@@ -1103,18 +1087,28 @@
        <el-form-item  label="公司佣金比例" prop="tuiMoneyRate">
             <el-input  v-model="form17.tuiMoneyRate" label="公司佣金比例"></el-input>
         </el-form-item>
-                <el-form-item  label="汇付支付回调地址" prop="hfPayNotifyUrl">
-                    <el-input  v-model="form17.hfPayNotifyUrl" label="汇付支付回调地址"></el-input>
-                </el-form-item>
-                <el-form-item  label="大额支付回调地址" prop="hfPayOnlineNotifyUrl">
-                    <el-input  v-model="form17.hfPayOnlineNotifyUrl" label="汇付支付回调地址"></el-input>
-                </el-form-item>
-                <el-form-item  label="汇付退款回调地址" prop="hfRefundNotifyUrl">
-                    <el-input  v-model="form17.hfRefundNotifyUrl" label="汇付退款回调地址"></el-input>
-                </el-form-item>
-                <el-form-item  label="汇付大额退款回调地址" prop="hfOnlineRefundNotifyUrl">
-                    <el-input  v-model="form17.hfOnlineRefundNotifyUrl" label="汇付大额退款回调地址"></el-input>
-                </el-form-item>-->
+        <el-form-item  label="汇付支付回调地址" prop="hfPayNotifyUrl">
+            <el-input  v-model="form17.hfPayNotifyUrl" label="汇付支付回调地址"></el-input>
+        </el-form-item>
+        <el-form-item  label="大额支付回调地址" prop="hfPayOnlineNotifyUrl">
+            <el-input  v-model="form17.hfPayOnlineNotifyUrl" label="汇付支付回调地址"></el-input>
+        </el-form-item>
+        <el-form-item  label="汇付退款回调地址" prop="hfRefundNotifyUrl">
+            <el-input  v-model="form17.hfRefundNotifyUrl" label="汇付退款回调地址"></el-input>
+        </el-form-item>
+        <el-form-item  label="汇付大额退款回调地址" prop="hfOnlineRefundNotifyUrl">
+            <el-input  v-model="form17.hfOnlineRefundNotifyUrl" label="汇付大额退款回调地址"></el-input>
+        </el-form-item>
+        <el-form-item label="是否开启微信发货" prop="isWeChatShipping">
+          <el-switch
+            v-model="form17.isWeChatShipping"
+            active-color="#13ce66"
+            inactive-color="#ff4949">
+          </el-switch>
+        </el-form-item>
+        <el-form-item  label="需要微信发货的小程序" prop="weChatShippingAppIds">
+          <el-input  v-model="form17.weChatShippingAppIds" label="请输入小程序AppId,多个用逗号隔开"></el-input>
+        </el-form-item>
 
         <div class="footer">
           <el-button type="primary" @click="submitForm17">提  交</el-button>