wjj 1 day ago
parent
commit
3655c994d7
2 changed files with 15 additions and 3 deletions
  1. 12 0
      src/views/his/package/index.vue
  2. 3 3
      src/views/hisStore/components/productOrder.vue

+ 12 - 0
src/views/his/package/index.vue

@@ -270,6 +270,11 @@
         <el-form-item label="标签" prop="tags">
           <el-input v-model="form.tags" placeholder="请输入标签" />
         </el-form-item>
+        <el-form-item label="ERP类型" prop="erpType">
+              <el-radio-group v-model="form.erpType">
+                 <el-radio :label="item.dictValue" v-for="item in erpTypeOptions" >{{item.dictLabel}}</el-radio>
+              </el-radio-group>
+         </el-form-item>
         <el-form-item label="套餐包类型" prop="packageType">
               <el-radio-group v-model="form.packageType">
                  <el-radio :label="item.dictValue" v-for="item in packageTypeOptions" >{{item.dictLabel}}</el-radio>
@@ -769,6 +774,7 @@ export default {
       packageTypeOptions: [],
       diseaseTypeOptions: [],
       privateTypeOptions: [],
+      erpTypeOptions:[],
       // 是否删除字典
       isDelOptions: [],
       packageSubTypeOptions:[],
@@ -803,6 +809,9 @@ export default {
               packageType: [
                 { required: true, message: '请选择套餐包类型', trigger: 'change' }
               ],
+              erpType: [
+                { required: true, message: '请选择erp类型', trigger: 'change' }
+              ],
               isShow: [
                 { required: true, message: '请选择是否展示', trigger: 'change' }
               ],
@@ -858,6 +867,9 @@ export default {
     this.getDicts("sys_package_sub_type").then(response => {
       this.packageSubTypeOptions = response.data;
     });
+    this.getDicts("sys_erp_type").then(response => {
+      this.erpTypeOptions = response.data;
+    });
     getAllCateList().then(response => {
       this.diseaseTypeOptions = response.data.diseaseType;
       this.privateTypeOptions = response.data.privateType;

+ 3 - 3
src/views/hisStore/components/productOrder.vue

@@ -24,7 +24,7 @@
           <el-button size="mini" @click="refundOrderMoney()" >退款</el-button>
         </div>
         <div class="operate-button-container"  v-hasPermi="['store:storeOrder:express']"  >
-          <el-button size="mini" @click="showExpress()" v-if="false">查看物流</el-button>
+          <el-button size="mini" @click="showExpress()" >查看物流</el-button>
         </div>
         <div class="operate-button-container" v-if="order.tuiMoneyStatus==0"  v-hasPermi="['store:storeOrder:editTuiMoney']"  >
           <el-button size="mini" @click="editTuiMoney1()" >解冻</el-button>
@@ -418,9 +418,9 @@
     </el-dialog>
 
     <el-dialog :title="expressDialog.title" :visible.sync="expressDialog.open" width="600px" append-to-body>
-<!--      <div  v-hasPermi="['store:storeOrder:syncExpress']"  >
+     <div  v-hasPermi="['store:storeOrder:syncExpress']"  >
         <el-button size="mini" @click="syncExpress()" >同步快递鸟物流状态</el-button>
-      </div>-->
+      </div>
       <el-table style="margin-top: 20px;width: 100%"
                 ref="orderHistoryTable"
                 :data="traces" border>