Merge branch 'release'

src/components/shop/send-set-dialog.vue

@@ -18,7 +18,14 @@
             <p>{{setReceiveInfo.receiver}} {{setReceiveInfo.receiverMobile}}</p>
           </div>
         </div>
-        <div v-if="dialogTitle == '发货设置'">
+        <div class="dt-wrap" v-if="dtType == 2">
+          <span class="dt-title">配送方式:</span>
+          <el-radio-group v-model="dtMode"  @change="radioChange">
+            <el-radio :label="1">物流配送</el-radio>
+            <el-radio :label="2">线下配送</el-radio>
+          </el-radio-group>
+        </div>
+        <div v-if="dtType == 1 || dtMode == 1">
           <p class="form-title">填写物流信息</p>
           <el-form ref="sendSetForm" :model="sendSetForm" :rules="rules" label-width="75px" label-suffix=":">
             <el-form-item label="快递公司" prop="expressName">
@@ -37,7 +44,7 @@
             </el-form-item>
           </el-form>
         </div>
-        <div v-if="dialogTitle == '配送设置'">
+        <div v-if="dtType == 2 && dtMode == 2 ">
           <p class="form-title">填写配送员信息</p>
           <el-form ref="sendSetForm" :model="sendSetForm" :rules="rules" label-width="75px" label-suffix=":">
             <el-form-item label="姓名" prop="sender">
@@ -79,15 +86,15 @@
         type: Boolean,
         default: false,
       },
-      dialogTitle: {
-        type: String,
-        default: ''
-      },
       sendSetFormData: {
         type: Object,
         required: true,
         default: () => {}
       },
+      dtType: { // 弹框的类型 1 为发货  2为配送
+        type: Number,
+        default: 1
+      },
     },
     data(){
       return{
@@ -116,6 +123,7 @@
         setReceiveInfo: {},
         showContent: 0,
         showChangeInfo: false,
+        dtMode: 1, //1.物流配送 2.线下配送
         rules: {
           expressName: [
             { required: true, message: '请输入快递公司', trigger: "blur"},
@@ -134,10 +142,8 @@
       }
     },
     created() {
-
     },
     mounted() {
-
     },
     watch: {
       sendGoodsDialog(val) {
@@ -148,6 +154,11 @@
         }
       },
     },
+    computed: {
+      dialogTitle(){
+        return this.dtType == 1 ? '发货设置' : '配送设置';
+      }
+    },
     methods: {
       cancelSendSet() {
         this.$refs.sendSetForm.resetFields();
@@ -158,15 +169,15 @@
         this.$refs.sendSetForm.validate((valid) => {
             if (valid) {
               let para = {...this.setReceiveInfo,...this.sendSetForm};
-
-              if (this.dialogTitle == '发货设置') {//发货设置的type是1，配送设置的type是2，配送完成的type是3
+              if (this.dtType == 1) {//发货设置的type是1，配送设置的type是2，配送完成的type是3
                 para.type = 1;
-              }else if (this.dialogTitle == '配送设置') {
+              }else if (this.dtType == 2) {
                 para.type = 2;
               }
               if (para.orderNo) {
                 para.id = para.orderNo;
               }
+              para.expressType = this.dtMode;
               openLoading(this);
               updateExpress(para).then(res => {
                 closeLoading(this);
@@ -188,13 +199,10 @@
               return false;
             }
         })
-
       },
-
       close(){
         this.$emit('closeSendSet',{type: 2})
       },
-
       //修改买家收货信息
       changeInfo() {
         this.showChangeInfo = true;
@@ -216,10 +224,14 @@
         }
         this.showChangeInfo = false;
       },
+      radioChange() {
+        this.$refs.sendSetForm.resetFields();
+        this.sendSetForm.remark = '';
+      }
     },
   }
 </script>
-<style lang="scss">
+<style lang="scss" >
   .send-set-body{
     .address-content{
       width: 100%;
@@ -242,6 +254,12 @@
         }
       }
     }
+    .dt-wrap {
+      margin-top: 20px;
+      .dt-title {
+        margin-right: 16px;
+      }
+    }
     .form-title{
       margin-top: 15px;
       margin-bottom: 15px;

src/style/global.scss

@@ -236,4 +236,21 @@
 .el-input__inner:focus, .el-textarea__inner:focus {
   border-color: #449284 !important;
 }
+.el-table {
+    th.el-table__cell>.cell.highlight {
+        color: #449284 !important;
+    }
+}
+.el-table-filter {
+    .el-table-filter__content {
+        .el-checkbox__input.is-checked+.el-checkbox__label {
+            color: #449284 !important;
+        }
+        .el-checkbox__input.is-checked .el-checkbox__inner, .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+            background-color: #449284 !important;
+            border-color: #449284 !important;
+
+        }
+    }
+}
 

src/utils/goods/index.js

@@ -123,3 +123,13 @@ export const getGoodsIdList = (params) => {
     description: '商品ID列表查询',
   })
 };
+
+export const getTypeCodeList = () => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`basic-data/constants/app?typeCodeList=P306`),
+    method: "get",
+    description: "获取适用人群类别",
+  });
+};
+

src/utils/shop/index.js

@@ -128,3 +128,12 @@ export const brokerOwnerListAll = (params) => {
     description: '云鹊店铺-订单管理-招募人列表',
   })
 };
+// 获取退款说明
+export const getRefundDesc = (aid) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`/store/orders/admin/queryRefundDesc/${aid}`),
+    method: 'get',
+    description: '退款说明',
+  })
+};

src/views/goods/create-good.vue

@@ -540,7 +540,7 @@
                 v-model="formData2.suitableArr"
                 :multiple="true"
                 placeholder="请选择"
-                size="small"
+                class="suitableList-select"
               >
                 <el-option
                     v-for="(item,index) in suitableList"
@@ -859,7 +859,7 @@
   let vm = null;
   import { openLoading, closeLoading } from "../../utils/utils";
   import { doUpload, getFilePath } from "../../utils/qiniu-util";
-  import { updateGoods ,updateStock,dosageAll,getDeparts,getGoodsList, getGoodDetails, updateGoodsV2, getHospitalInfoByStoreId, getCheckPackageIdList } from '@/utils/goods';
+  import { updateGoods ,updateStock,dosageAll,getDeparts,getGoodsList, getGoodDetails, updateGoodsV2, getHospitalInfoByStoreId, getCheckPackageIdList, getTypeCodeList } from '@/utils/goods';
   import Cropper from '@/components/common/cropper.vue'
 
   import { originRules1, originRules2, originRules } from './rules';
@@ -947,8 +947,8 @@
         checkPackageIdList: [{name:'其他',content:0}],
         hospitalTypeList: [{label:'村卫生室',value:1},{label:'乡镇卫生院/中心',value:2}], // 医疗机构类型
         checkTypeList: [{label:'常规检测',value:1}], // 检测类型
-        suitableList: [{label:'儿童',value:'1'},{label:'青年',value:'2'},{label:'中年',value:'4'},{label:'老年',value:'8'},{label:'40-74岁的结直肠癌高风险人群',value:'10'}], // 适用人群
-
+        // suitableList: [{label:'儿童',value:'1'},{label:'青年',value:'2'},{label:'中年',value:'4'},{label:'老年',value:'8'},{label:'40-74岁的结直肠癌高风险人群',value:'10'}], // 适用人群
+        suitableList: [],
         // 不同类型服务的表单通用字段
         // 不同类型服务的表单通用字段
         // 不同类型服务的表单通用字段
@@ -1017,6 +1017,7 @@
       this.isEdit = id != 'add';
       this.curmbThird = this.title;
       this.formData.storeId = Number(storeId) || '';
+      this.getTypeCodeList();
       this.getLever(0,1)
       dosageAll().then((res)=>{
         this.doseAll = res.data
@@ -1047,11 +1048,26 @@
       }
     },
     methods: {
+      // 获取适用人群
+      getTypeCodeList() {
+        return getTypeCodeList().then((res) => {
+          if (res.code == '000000') {
+            this.suitableList = [];
+            for (const item of res.data) {
+               this.suitableList.push({
+                 label: item.value,
+                 value: item.no + ''
+               })
+            }
+          }
+        }).catch((err)=>{})
+      },
       //eidt状态
       async getDetailByEdit(id, goodsType){
         this.goodsId = id ;
         if(goodsType == 337){
           this.isCheckServe = true;
+          await this.getTypeCodeList();
           const res = await getGoodDetails(id);
           console.log(`========================>`, res);
           if(res.code != '000000'){
@@ -1790,6 +1806,9 @@
         }
       }
     }
+    .suitableList-select {
+      width: 445px;
+    }
     .el-button--text{
       color: #449284;
       font-size: 14px;