Merge branch 'release' into 'master'

Release

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!339

src/components/education/custom-resource/edit-course-dialog.vue

@@ -322,7 +322,7 @@
       <div v-show="step == 2" class="course-content-step2">
         <img class="success-img" src="../../../assets/image/phrase3/icon-audit-success.png" />
         <span class="tips-1">您上传的课程已成功提交，预计在3-5个工作日内完成审核</span>
-        <span class="tips-2">审核通过后，您才可以选择课程完成项目配置。如有任何疑问可联系云鹊医400-920-8877</span>
+        <span class="tips-2">审核通过后，您才可以选择课程完成项目配置。如有任何疑问可联系云鹊医400-006-5252</span>
         <el-button class="back-btn" type="primary" icon="el-icon-back" @click="backToOrgCourse">返回机构课程</el-button>
       </div>
       <div v-show="step == 1" slot="footer" class="dialog-footer">

src/components/opinionDialog.vue

@@ -43,7 +43,7 @@
 
         <div slot="footer" class="dialog-footer bottom-msg">
           <div class="disblock">
-            <h1>客服电话：400-920-8877  工作日：9:00~18:00</h1>
+            <h1>客服电话：400-006-5252  工作日：9:00~18:00</h1>
           </div>
           <div class="disblock">
             <img src="https://file.yunqueyi.com/File/static/qrcode_for_yunqueyi.jpg" alt="">

src/utils/base/baseApi.js

+import fetch from "../fetch";
+import { getBaseUrl } from "@/utils/index";
+let headers = {
+  "Content-Type": "application/json;charset=UTF-8",
+  token: localStorage.getItem("storageToken"),
+};
+
+/*获取省份*/
+export const getProvinces = () => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`/basic-data/position/provinces`),
+    method: "get",
+  });
+};
+
+// /*获取市*/
+export const getCities = (params) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`/basic-data/position/cities`),
+    method: "get",
+    params: params,
+  });
+};
+
+// /*获取区*/
+export const getCounties = (params) => {
+  return fetch({
+    url: getBaseUrl(`/basic-data/position/counties`),
+    method: "get",
+    params: params,
+  });
+};
+
+// /*获取乡镇*/
+export const getTowns = (params) => {
+  return fetch({
+    url: getBaseUrl(`/basic-data/position/towns`),
+    method: "get",
+    params: params,
+  });
+};

src/utils/shop/index.js

@@ -137,3 +137,21 @@ export const getRefundDesc = (aid) => {
     description: '退款说明',
   })
 };
+
+export const getLgCompanyList = () => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`/basic-data/constants/app/no-chars/P307`),
+    method: "get",
+    description: "获取物流公司",
+  });
+};
+
+export const getStoreAdressRepot = (storeId) => {
+  return fetch({
+    headers,
+    url: getBaseUrl(`store/query/${storeId}/repot`),
+    method: "get",
+    description: "获取店铺退货地址信息",
+  });
+};

src/views/education/report-download.vue

@@ -66,7 +66,7 @@ export default {
           if(res.data == 1) {
             vm.$message.success('下载成功，请移至“下载报告”页面的“导出列表”中查看');
           } else {
-            vm.$message.error('下载失败，请联系管理员或拨打咨询电话：400-920-8877');
+            vm.$message.error('下载失败，请联系管理员或拨打咨询电话：400-006-5252');
           }
         }
       });

src/views/followup/plan-manage/dialog/set-time-node.vue

@@ -103,7 +103,7 @@
                 </el-form-item>
                 <div class="tips-contnt" v-if="itemTimeForm.hasSelected">
                   <p class="yellow-font">当前计划中共{{totalNumber}}位居民（微信：{{wechatPatientNum}}位，短信：{{messagePatientNum}}位），本次定时推送任务在发送当日预计需要{{messagePatientNum}}条短信额度（微信推送不消耗额度，建议您让居民关注云鹊健康微信公众号），务必提前确保短信额度的充足。</p>
-                  <p>需要更多额度，请前往「云鹊医App-个人中心-啾啾币中心」兑换短信额度后再进行预约，您也可以联系云鹊医客服购买短信额度，客服电话：400-920-8877</p>
+                  <p>需要更多额度，请前往「云鹊医App-个人中心-啾啾币中心」兑换短信额度后再进行预约，您也可以联系云鹊医客服购买短信额度，客服电话：400-006-5252</p>
                 </div>
                 <el-form-item label="履约登记表">
                   <el-select

src/views/followup/reservation-manage/dialog/no-enough.vue

@@ -9,7 +9,7 @@
                :before-close="closeTipsDialog">
       <div class="no-enough-content">
         <h3>余额不足提醒</h3>
-        <p class="section">您的短信额度已欠费，请前往「云鹊医App-个人中心-啾啾币中心」兑换短信额度后再进行预约<br/>您也可以联系云鹊医客服购买短信额度，客服电话：400-920-8877</p>
+        <p class="section">您的短信额度已欠费，请前往「云鹊医App-个人中心-啾啾币中心」兑换短信额度后再进行预约<br/>您也可以联系云鹊医客服购买短信额度，客服电话：400-006-5252</p>
         <p class="tip">提示：微信推送不消耗额度，建议您与居民绑定微信，关注云鹊健康微信公众号</p>
       </div>
       <div slot="footer" class="dialog-footer">

src/views/goods/create-good.vue

@@ -76,6 +76,7 @@
                 </div>
               </el-upload>
               <p class="upload-message" v-if="!isgoodsImages">请上传商品头图</p>
+              <!-- <p class="upload-message" v-if="uploadImgMessage1">请上传商品头图</p> -->
             </el-form-item>
             <el-form-item label="商品类型" prop="goodsType">
               <el-select
@@ -92,7 +93,15 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <!-- <p class="upload-message" v-if="uploadImgMessage1">请上传商品头图</p> -->
+             <el-form-item label="是否支持售后" prop="expressLimitFlag" v-if="storeType < 3">
+              <el-radio-group v-model="formData.expressLimitFlag" :disabled="!hasRepoFlag">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+              <p class="backTip" v-if="!hasRepoFlag" @click="goShopDeatil">若需设置商品支持售后，需先至店铺页<span class="ad-back">设置售后地址</span></p>
+            </el-form-item>
+           
+
           </div>
         </el-form>
 
@@ -860,8 +869,8 @@
   import { openLoading, closeLoading } from "../../utils/utils";
   import { doUpload, getFilePath } from "../../utils/qiniu-util";
   import { updateGoods ,updateStock,dosageAll,getDeparts,getGoodsList, getGoodDetails, updateGoodsV2, getHospitalInfoByStoreId, getCheckPackageIdList, getTypeCodeList } from '@/utils/goods';
+  import { getStoreAdressRepot } from "@/utils/shop";
   import Cropper from '@/components/common/cropper.vue'
-
   import { originRules1, originRules2, originRules } from './rules';
   import { originForm1, originForm2, originForm } from './forms';
 
@@ -992,17 +1001,19 @@
         limitVisibleFlag:false,
         limit:{
           title:"限购条件"
-        }
-
+        },
+        storeType: 1, //1: "供货商",2: "小药房",3: "医生小店"
+        hasRepoFlag: 0 //店铺是否有退货地址
       }
     },
     created() {
       vm = this;
-      const { id, storeId, goodsType, inputType, commissionFlag} = this.$route.query;
+      const { id, storeId, goodsType, inputType, commissionFlag, storeType} = this.$route.query;
       this.goodsType = goodsType;
       this.storeId = storeId;
       this.inputType = inputType || '';
       this.commissionFlag = commissionFlag;
+      this.storeType = storeType;
       // this.formData = originForm;
       // this.formData1 = originForm1;
       // this.formData2 = originForm2;
@@ -1011,7 +1022,7 @@
       this.rules2 = originRules2;
       // this.rules2.barCode = originRules.barCode;
 
-      this.jumPathThird = '/goods-manage?storeId=' + storeId +'&commissionFlag=' + this.commissionFlag;
+      this.jumPathThird = '/goods-manage?storeId=' + storeId +'&commissionFlag=' + this.commissionFlag +'&storeType=' + this.storeType;
       //this.jumPathThird = '/create-good?id=add&storeId=46'
       this.title = id == 'add' ? '新增商品' : '编辑商品';
       this.isEdit = id != 'add';
@@ -1034,6 +1045,8 @@
           console.log(`getCheckPackageIdList`, res);
           this.checkPackageIdList = res.data;
         })
+      } else {
+        this.getStoreAdress();
       }
       // debugger;
       // 判空
@@ -1083,12 +1096,13 @@
             });
           };
 
-          const { goodsInfo, medicalService, buyLimitDtoList} = res.data;
+          const { goodsInfo, medicalService, buyLimitDtoList, hasRepoFlag} = res.data;
 
           this.formData = {...this.formData, ...goodsInfo};
           this.formData2 = medicalService;
           this.formData = { ...this.formData, ...this.formData2 };
           this.buyLimitDtoList = buyLimitDtoList;
+          this.hasRepoFlag = hasRepoFlag;
           this.$set(this.formData2, 'suitableArr', this.formData.suitable.split(','));
           this.$set(this.formData, 'suitableArr', this.formData.suitable.split(','));
           this.formData.optPrice = this.formData.costPrice/100;
@@ -1109,6 +1123,7 @@
             goodsType	:'',
             pageNo:1,
             pageSize:	10,
+            storeId: this.storeId
           });
           if(res.code != '000000'){
             return this.$message({
@@ -1122,9 +1137,10 @@
               type: 'error'
             });
           }
-          const {goodsList} = res.data;
+          const {goodsList, hasRepoFlag } = res.data;
           this.formData1 = goodsList[0];
           this.formData = goodsList[0];
+          this.hasRepoFlag = hasRepoFlag;
           this.buyLimitDtoList = this.formData.buyLimitDtoList;
           this.formData.optPrice = this.formData.costPrice/100;
           this.fileGoodsList = this.getImges(goodsList[0].goodsImgList,1);
@@ -1506,7 +1522,8 @@
             path: '/goods-manage',
             query: {
               storeId: this.formData.storeId,
-              commissionFlag: this.commissionFlag
+              commissionFlag: this.commissionFlag,
+              storeType: this.storeType
             }
           })
         })
@@ -1763,7 +1780,6 @@
           }
         }
       },
-
       checkCount(){
         let flag = true;
         if(this.formData.saleType == 1 && this.formData.mostCount == 0){
@@ -1785,8 +1801,31 @@
         }
         return flag;
 
-      }
-
+      },
+      goShopDeatil() {
+        this.$router.push({
+          path: `/create-shop`,
+          query:{
+            storeId: this.storeId,
+            // storeData: JSON.stringify(row),
+          }
+        })
+      },
+      //店铺是否配置售后地址
+      getStoreAdress() {
+        getStoreAdressRepot(this.storeId).then(res => {
+          if (res.code == "000000") {
+            // repotList 地址数组
+            if(res.data && res.data.repotList && res.data.repotList.length) {
+              this.hasRepoFlag = true;
+            } else {
+              this.hasRepoFlag = false;
+            }
+          } else {
+            this.$message.error(res.message);
+          }
+        })     
+      },
     },
   }
 </script>
@@ -1856,7 +1895,14 @@
       font-size: 12px;
       color: #f56c6c;
     }
-
+    .backTip {
+      font-size: 12px;
+      color: red;
+      cursor: pointer;
+    }
+    .ad-back {
+      color: #449284;
+    }
     .img-delete {
       position: absolute;
       left: 0px;

src/views/goods/forms.js

 const form1 = {
-  categoryIdLevel2: '',
-  categoryIdLevel3: '',
-  categoryIdLevel4: '',
-  categoryIdLevel5: '',
-  medicCommonName:'',
-  medicGoodsName:'',
-  size:'',
-  dosageId:null,
-  usage:'',
-  otc1:'1',
-  approvalNumber:'',
-  manufacturer:'',
-  department:'',
-  expiredTime:'',
-  specification_url:'',
-  treatDisease:'',
-  barCode: '',
-  modelNo: '', // 型号
-  standardNo: '', // 执行标准号
-}
+  categoryIdLevel2: "",
+  categoryIdLevel3: "",
+  categoryIdLevel4: "",
+  categoryIdLevel5: "",
+  medicCommonName: "",
+  medicGoodsName: "",
+  size: "",
+  dosageId: null,
+  usage: "",
+  otc1: "1",
+  approvalNumber: "",
+  manufacturer: "",
+  department: "",
+  expiredTime: "",
+  specification_url: "",
+  treatDisease: "",
+  barCode: "",
+  modelNo: "", // 型号
+  standardNo: "", // 执行标准号
+};
 
 const form2 = {
   checkPackageId: '', // 检测登记表，暂无，先隐藏！！！！！！！！！！！
@@ -48,24 +48,25 @@ const form = {
   // specificationImages:[],
   // goodsId: 0, // 新增时传0，更新时必需>0
   id: 0,
-  goodsName:'',
-  goodsDescription:'',
-  goodsHeaderImages:[],
-  goodsType:'',
-  barCode: '',
-  costPrice:0,
-  decrStock:0,//减少库存
-  incrStock:'',//增加库存
-  storeId: '',
-  optPrice:'',
-  goodsStock:0,
+  goodsName: "",
+  goodsDescription: "",
+  goodsHeaderImages: [],
+  goodsType: "",
+  barCode: "",
+  costPrice: 0,
+  decrStock: 0, //减少库存
+  incrStock: "", //增加库存
+  storeId: "",
+  optPrice: "",
+  goodsStock: 0,
   stock: 0,
-  externalGoodsCode: '',
-  leastCount:1,
+  externalGoodsCode: "",
+  leastCount: 1,
   mostCount: -1,
-  incrType:1,
-  saleType:1,
-  minWhole:0
+  incrType: 1,
+  saleType: 1,
+  minWhole: 0,
+  expressLimitFlag: 0, //是否支持退货退款
 };
 
 

src/views/goods/goods-manage.vue

@@ -121,7 +121,10 @@
             <span>{{ scope.row.goodsStatus | rangeStatus }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="quantityOfSale" label="销量" width="120" align="center">
+        <el-table-column prop="quantityOfSale" label="有效销量" width="120" align="center">
+
+        </el-table-column>
+        <el-table-column prop="quantityOfUnPaidSale" label="待付款销量" width="120" align="center">
 
         </el-table-column>
         <el-table-column prop="size" label="规格" width="120" align="center">
@@ -345,16 +348,14 @@
             </span>
     </el-dialog>
 
-
   </div>
 </template>
 <script>
   let vm = null;
   import { openLoading, closeLoading } from "../../utils/utils";
   import BreadCrumb from "@/components/breadcrumb.vue";
-  import { getRangeList,updateRangeStatus, getGoodsExportUrl, getOrdersExportUrl } from "../../utils/yqrange/yqrangeApi";
+  import { getGoodsExportUrl } from "../../utils/yqrange/yqrangeApi";
   import { getGoodsList,batchOnOff,uploadExcel} from '@/utils/goods';
-  import { getBaseUrl } from '@/utils/index'
   var typeList = [{
     categoryName: "短信额度",
     id: 1,
@@ -486,9 +487,10 @@
       vm = this;
       this.getLists()
       this.getLever()
-      const {storeId,commissionFlag} = this.$route.query;
+      const {storeId,commissionFlag,storeType} = this.$route.query;
       this.searchForm.storeId = Number(storeId) || 0;
       this.commissionFlag = commissionFlag;
+      this.storeType = storeType;
       // if(storeId){
       //   this.searchForm.storeId = storeId
       // }
@@ -691,12 +693,13 @@
         }
       },
       edit(row){
-        const { goodsType } = row;
+        const { goodsType, storeType } = row;
+        //  storeType 1: "供货商",2: "小药房",3: "医生小店"
         let url = ''
         if(row == 'add'){
-          url = `/create-good?id=add&storeId=${this.searchForm.storeId}&inputType=1&commissionFlag=${this.commissionFlag}`
+          url = `/create-good?id=add&storeId=${this.searchForm.storeId}&inputType=1&commissionFlag=${this.commissionFlag}&storeType=${this.storeType}`
         }else{
-          url = `/create-good?id=${row.goodsId}&storeId=${this.searchForm.storeId}&goodsType=${goodsType}&commissionFlag=${this.commissionFlag}`
+          url = `/create-good?id=${row.goodsId}&storeId=${this.searchForm.storeId}&goodsType=${goodsType}&commissionFlag=${this.commissionFlag}&storeType=${storeType}`
         }
         // this.$store.dispatch('goodsManage/changeGoodsInfo', {...row});
         this.$router.push({

src/views/goods/rules.js

@@ -99,6 +99,9 @@ const rules = {
   goodsType:[
     { required: true, message: "请选择商品类型", trigger: "change" }
   ],
+  hcd:[
+    { required: true, message: "请选择是否支持退货退款", trigger: "change" }
+  ],
   optPrice: [
     { required: true, message: "请输入价格", trigger: "blur" },
   ],

src/views/layout/header.vue

@@ -29,7 +29,7 @@
           <el-col :span="15" class="msg-phone">
             <div class="grid-content bg-purple-light" style="cursor: default;">
               <i class="el-icon-phone" style="cursor: default;"></i>
-              <h1 style="cursor: default;">400-920-8877</h1>
+              <h1 style="cursor: default;">400-006-5252</h1>
             </div>
           </el-col>
         </el-row>

src/views/learning/item-data-all.vue

@@ -3,7 +3,7 @@
     <div v-if="dataType == 0" class="data-chart">
       <div class="box-list">
         <div class="box-min">
-          <div v-for="(item , index) in cardData" :key="index" class="box-card" v-bind:class="{ 'box-last': index == 2 }">
+          <div v-for="(item , index) in cardData" :key="index" class="box-card" v-bind:class="{ 'box-last': index == 3 }">
             <el-tooltip v-if="index == 2" class="item-tool" placement="bottom-end" effect="light">
               <div slot="content">
                 <p v-for="text in item.content">{{ text }}</p>
@@ -166,7 +166,7 @@
     <div v-if="dataType == 1" class="data-table">
       <div class="box-list">
         <div class="box-min-2">
-          <div v-for="(item , index) in cardData" :key="index" class="box-card box-card2" v-bind:class="{ 'box-last': index == 1 }">
+          <div v-for="(item , index) in cardData" :key="index" class="box-card box-card2" v-bind:class="{ 'box-last': index == 2 }">
             <el-tooltip v-if="index == 1" class="item-tool" placement="bottom-end" effect="light">
               <div slot="content">
                 <p v-for="text in item.content">{{ text }}</p>
@@ -791,6 +791,17 @@ export default {
           content: [
             "获证率：已获证人数/应参与人数*100%",
           ]
+        },
+        {
+          value: "0%",
+          title: " 参与完成率",
+          hasKey: "已完成人数 ",
+          hasNum: "0",
+          shouldKey: "已参与人数",
+          shouldNum: "0",
+          content: [
+            "参与完成率：已完成人数/已参与人数*100%",
+          ]
         }
       ];
       if(data == null) {
@@ -802,11 +813,11 @@ export default {
         }
         return;
       }
-      cardData[2].title = vm.certFlag == 0 ? '完成率' : '获证率';
+      cardData[2].title = vm.certFlag == 0 ? '项目完成率' : '获证率';
       cardData[2].hasKey = vm.certFlag == 0 ? '已完成人数' : '已获证人数';
       if(vm.certFlag == 0) {
         cardData[2].content = [
-          "完成率：已完成人数/应参与人数*100%",
+          "项目完成率：已完成人数/应参与人数*100%",
         ]
       } else {
         cardData[2].content = [
@@ -821,15 +832,23 @@ export default {
       cardData[2].value = parseFloat((data.certificateRate*100).toFixed(1)) + '%';
       cardData[2].hasNum = data.finishCount;
       cardData[2].shouldNum = data.doctorCount;
+
+      const p = data.joinCount ? data.finishCount/data.joinCount : 0;
+
+      cardData[3].value = parseFloat((p*100).toFixed(1)) + '%';
+      cardData[3].hasNum = data.finishCount;
+      cardData[3].shouldNum = data.joinCount;
+
       if(vm.dataType == 0) {
         cardData[0].value = parseFloat((data.hospitalRate*100).toFixed(1)) + '%';
-        cardData[0].hasNum = data.hospitalJoinCount;
-        cardData[0].shouldNum = data.hospitalCount;
+        cardData[0].hasNum = data.joinCount;
+        cardData[0].shouldNum = data.finishCount;
 
         vm.cardData = cardData;
       } else if(vm.dataType == 1) {
         vm.cardData = cardData.slice(1);
       }
+      console.log('---cardData',  vm.dataType, vm.cardData)
     },
     updateResize() {
       // setTimeout(function() {
@@ -1156,6 +1175,7 @@ export default {
     .box-min {
       height: 106px;
       min-width: 1050px;
+      overflow-x: scroll;
     }
     .box-min-2 {
       height: 106px;
@@ -1165,7 +1185,7 @@ export default {
       position: relative;
       background-color: #F1F7F6;
       color: #449284;
-      width: 32%;
+      width: 23%;
       margin-right: 2%;
       height: 106px;
       float: left;
@@ -1420,7 +1440,7 @@ export default {
       .el-radio-button {
         .el-radio-button__inner {
           border:0 solid #666666 !important;
-          box-shadow: 0;
+          box-shadow: none;
         }
       }
       .is-active {
@@ -1430,7 +1450,7 @@ export default {
           border-radius:10px 10px 0px 0px;
           background:#DFDFDF !important;
           border:0 solid #666666 !important;
-          box-shadow: 0;
+          box-shadow: none;
         }
       }
     }

src/views/shop/shop-list.vue

@@ -386,7 +386,8 @@
           path: '/goods-manage',
           query: {
             storeId: row.tradeStore.id,
-            commissionFlag:row.tradeStore.commissionFlag
+            commissionFlag:row.tradeStore.commissionFlag,
+            storeType:row.tradeStore.storeType  //  1: "供货商",2: "小药房",3: "医生小店"
           }
         });
         window.open(routeData.href, '_blank');