Merge branch 'master' of gitee.com:darlk/ShengTangManage

2021-01-28 15:54:24 +08:00
parent dad428d90c 0479cfe4ae
commit c4458be248
8 changed files with 288 additions and 87 deletions
--- a/stdiet-ui/src/views/custom/healthy/index.vue
+++ b/stdiet-ui/src/views/custom/healthy/index.vue
@@ -607,6 +607,7 @@
            ["辅助睡眠类药物名称","是否经常熬夜","熬夜频次"]
          ],
          [
+            ["病史体征","湿气数据","气血数据"],
            ["家族疾病史","手术史","近期是否做过手术"],
            ["手术恢复情况","是否长期服用药物","长期服用的药物"],
            ["是否出现过过敏症状","过敏症状","过敏源"]
@@ -642,6 +643,7 @@
            ["sleepDrug","stayupLateFlag","stayupLateWeekNum"]
          ],
          [
+            ["physicalSigns","moistureDate","bloodData"],
            ["familyIllnessHistory","operationHistory","nearOperationFlag"],
            ["recoveryeSituation","longEatDrugFlag","longEatDrugClassify"],
            ["allergyFlag","allergySituation","allergen"]
@@ -757,12 +759,22 @@
             motionStr += item ? ((motionStr != "" ? "，" : "") + item) : "";
            });
         }
-          detailHealthy.motion =  motionStr + (detailHealthy.otherMotionClassify ? ( "，"+ detailHealthy.otherMotionClassify) : "");
+          detailHealthy.motion =  this.trimComma(motionStr + (detailHealthy.otherMotionClassify ? ( "，"+ detailHealthy.otherMotionClassify) : ""));
          detailHealthy.motionField += detailHealthy.otherMotionField ? ("，"+detailHealthy.otherMotionField) : "";

          detailHealthy.sleepDrugFlag = detailHealthy.sleepDrugFlag == 1 ? "有" : "无";
          detailHealthy.stayupLateFlag = detailHealthy.stayupLateFlag == 1 ? "有" : "无";
          detailHealthy.stayupLateWeekNum += "次/周";
+
+          let physicalSigns = "";
+          if(detailHealthy.signList != null && detailHealthy.signList.length > 0){
+            detailHealthy.signList.forEach(function (sign, index) {
+              physicalSigns += "," + sign.name;
+            })
+          }
+          physicalSigns += "," + (detailHealthy.otherPhysicalSigns ? detailHealthy.otherPhysicalSigns : "");
+          detailHealthy.physicalSigns = this.trimComma(physicalSigns);
+
          detailHealthy.familyIllnessHistory += detailHealthy.otherFamilyIllnessHistory ? ("，" + detailHealthy.otherFamilyIllnessHistory) : "";
          detailHealthy.operationHistory += detailHealthy.otherOperationHistory ? ("，" + detailHealthy.otherOperationHistory) : "";
          detailHealthy.nearOperationFlag = detailHealthy.nearOperationFlag == 1 ? "有" : "无";
@@ -774,10 +786,11 @@
          detailHealthy.allergen += detailHealthy.otherAllergen ? ("，" +detailHealthy.otherAllergen) : "";

          let medicalReportPathArray = detailHealthy.medicalReport ? detailHealthy.medicalReport.split(",") : [];
+          let medicalReportNameArray = detailHealthy.medicalReportName ? detailHealthy.medicalReportName.split(",") : [];
          this.medicalReportPathArray = medicalReportPathArray;
-          detailHealthy.medicalReport_one = medicalReportPathArray.length > 0 ? "体检报告(1)" : "";
-          detailHealthy.medicalReport_two =  medicalReportPathArray.length > 1 ? "体检报告(2)" : "";
-          detailHealthy.medicalReport_three = medicalReportPathArray.length > 2 ? "体检报告(3)" : "";
+          detailHealthy.medicalReport_one = medicalReportPathArray.length > 0 ? (medicalReportNameArray.length > 0 ? medicalReportNameArray[0] : "体检报告（1）") : "";
+          detailHealthy.medicalReport_two =  medicalReportPathArray.length > 1 ? (medicalReportNameArray.length > 1 ? medicalReportNameArray[1] : "体检报告（2）") : "";
+          detailHealthy.medicalReport_three = medicalReportPathArray.length > 2 ? (medicalReportNameArray.length > 2 ? medicalReportNameArray[2] : "体检报告（3）") : "";

          for(let i = 0; i < this.healthyTitleData.length; i++){
            let stepArray = [];
@@ -1017,6 +1030,15 @@
      },
      downloadFile(fileName){
         this.downloadResource(fileName);
+      },
+      trimComma(str){
+         if(str.startsWith("，") || str.startsWith(",")){
+          str = str.substring(1,str.length);
+         }
+         if(str.endsWith("，") || str.endsWith(",")){
+           str = str.substring(0,str.length-1);
+         }
+         return str;
      }
    }
  };
--- a/stdiet-ui/src/views/custom/order/index.vue
+++ b/stdiet-ui/src/views/custom/order/index.vue
@@ -8,7 +8,7 @@
        v-show="showSearch"
        label-width="70px"
      >
-        <el-col :span="6">
+        <!--<el-col :span="6">
          <el-form-item label="手机号" prop="phone">
            <el-input
              v-model="queryParams.phone"
@@ -18,12 +18,12 @@
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
-        </el-col>
+        </el-col>-->
        <el-col :span="6">
-          <el-form-item label="客户姓名" prop="customer">
+          <el-form-item label="客户信息" prop="customer">
            <el-input
              v-model="queryParams.customer"
-              placeholder="请输入客户姓名"
+              placeholder="请输入客户姓名或手机号"
              clearable
              size="small"
              @keyup.enter.native="handleQuery"
@@ -237,6 +237,18 @@
            </el-select>
          </el-form-item>
        </el-col>
+        <el-col :span="6">
+          <el-form-item label="订单金额" prop="amountFlag">
+            <el-select
+              v-model="queryParams.amountFlag"
+              placeholder="请选金额状态"
+            >
+              <el-option :key="0" label="全部订单" :value="null" />
+              <el-option :key="1" label="正常订单" :value="0" />
+              <el-option :key="2" label="退款订单" :value="1" />
+            </el-select>
+          </el-form-item>
+        </el-col>
        <el-col :span="12">
          <el-form-item label="成交日期" prop="orderTime">
            <el-date-picker
@@ -1088,6 +1100,11 @@ export default {
      this.payTypeIdOptions = response.data;
    });
    this.getDicts("cus_account").then((response) => {
+      response.data.splice(0, 0, {
+        dictValue: 0,
+        dictLabel: "无",
+        remark: null,
+      });
      this.accountIdOptions = response.data;
    });
    this.getDicts("cus_serve_time").then((response) => {
@@ -1223,6 +1240,7 @@ export default {
        startTime: dayjs().add(3, "day").format("YYYY-MM-DD"),
        pauseTime: null,
        payTypeId: defaultPayType ? parseInt(defaultPayType.dictValue) : null,
+        accountId: defaultAccount ? parseInt(defaultAccount.dictValue) : null,
        preSaleId: defaultPresale ? parseInt(defaultPresale.dictValue) : null,
        createBy: null,
        createTime: null,
@@ -1261,8 +1279,6 @@ export default {
          ? parseInt(defaultConditioningProjectIdOption.dictValue)
          : null,
        becomeFanTime: dayjs().format("YYYY-MM-DD"),
-        //收款账号的初始化放最后，使得可以watch中监听到变化，保证策划、策划助理、运营、运营助理初始化
-        accountId: defaultAccount ? parseInt(defaultAccount.dictValue) : null,
      };
      this.resetForm("form");
    },
@@ -1293,6 +1309,7 @@ export default {
    handleUpdate(row) {
      this.reset();
      const orderId = row.orderId || this.ids;
+      this.form.accountId = "no";
      getOrder(orderId).then((response) => {
        this.form = response.data;
        this.form.giveServeDay = parseInt(this.form.giveServeDay + "");
@@ -1385,38 +1402,47 @@ export default {
        let planningAndOperationValue = this.orderDropdownCorrespondingOptions.find(
          (opt) => parseInt(opt.dictValue) === this.form.accountId
        );
-        let array = planningAndOperationValue.dictLabel.split("|");
-        let plannerIdOption = this.plannerIdOptions.find(
-          (opt) => opt.dictValue == array[0]
-        );
-        this.form.plannerId = plannerIdOption
-          ? parseInt(plannerIdOption.dictValue)
-          : 0;
-        let plannerAssisIdOption = this.plannerAssisIdOptions.find(
-          (opt) => opt.dictValue == array[1]
-        );
-        this.form.plannerAssisId = plannerAssisIdOption
-          ? parseInt(plannerAssisIdOption.dictValue)
-          : 0;
-        let operatorIdOption = this.operatorIdOptions.find(
-          (opt) => opt.dictValue == array[2]
-        );
-        this.form.operatorId = operatorIdOption
-          ? parseInt(operatorIdOption.dictValue)
-          : 0;
-        let operatorAssisIdOption = this.operatorAssisIdOptions.find(
-          (opt) => opt.dictValue == array[3]
-        );
-        this.form.operatorAssisId = operatorAssisIdOption
-          ? parseInt(operatorAssisIdOption.dictValue)
-          : 0;
+        if (planningAndOperationValue) {
+          let array = planningAndOperationValue.dictLabel.split("|");
+          let plannerIdOption = this.plannerIdOptions.find(
+            (opt) => opt.dictValue == array[0]
+          );
+          this.form.plannerId = plannerIdOption
+            ? parseInt(plannerIdOption.dictValue)
+            : 0;
+          let plannerAssisIdOption = this.plannerAssisIdOptions.find(
+            (opt) => opt.dictValue == array[1]
+          );
+          this.form.plannerAssisId = plannerAssisIdOption
+            ? parseInt(plannerAssisIdOption.dictValue)
+            : 0;
+          let operatorIdOption = this.operatorIdOptions.find(
+            (opt) => opt.dictValue == array[2]
+          );
+          this.form.operatorId = operatorIdOption
+            ? parseInt(operatorIdOption.dictValue)
+            : 0;
+          let operatorAssisIdOption = this.operatorAssisIdOptions.find(
+            (opt) => opt.dictValue == array[3]
+          );
+          this.form.operatorAssisId = operatorAssisIdOption
+            ? parseInt(operatorAssisIdOption.dictValue)
+            : 0;
+        } else {
+          this.form.plannerId = 0;
+          this.form.plannerAssisId = 0;
+          this.form.operatorId = 0;
+          this.form.operatorAssisId = 0;
+        }
      }
    },
  },
  watch: {
    // 监听收款账号的变化
    "form.accountId": function (newVal, oldVal) {
-      this.initPlanningAndOperation();
+      if (oldVal != "no" && newVal != "no") {
+        this.initPlanningAndOperation();
+      }
    },
  },
 };
--- a/stdiet-ui/src/views/custom/subhealthy/investigation/index.vue
+++ b/stdiet-ui/src/views/custom/subhealthy/investigation/index.vue
@@ -409,7 +409,7 @@
            <el-checkbox v-for="(item,index) in healthyData['aerobicMotionClassifyArray']" :label="item.value" :key="index">{{item.name}}</el-checkbox>
          </el-checkbox-group>
        </div>
-        <div><span>有氧运动</span>
+        <div><span>无氧运动</span>
          <el-checkbox-group v-model="form.anaerobicMotionClassify">
            <el-checkbox v-for="(item,index) in healthyData['anaerobicMotionClassifyArray']" :label="item.value" :key="index">{{item.name}}</el-checkbox>
          </el-checkbox-group>
@@ -461,7 +461,40 @@
      </div>
      <div v-show="stepArray[7]">
      <p class="p_title_1">{{healthyData['titleArray'][7]}}</p>
-      <p class="p_title_2">1、家族疾病史情况</p>
+        <p class="p_title_2">1、本人病史情况</p>
+        <el-form-item label="(1) 病史体征(可多选)" prop="physicalSignsId" class="margin-left">
+          <el-select v-model="form.physicalSignsId" multiple placeholder="请选择">
+            <el-option
+              v-for="physicalSign in physicalSignsList"
+              :key="physicalSign.id"
+              :label="physicalSign.name"
+              :value="physicalSign.id"
+            >
+            </el-option>
+          </el-select>
+          <div><span>其他病史体征</span>
+            <el-input type="textarea"
+              placeholder="请输入病史体征"
+              v-model="form.otherPhysicalSigns"
+              maxlength="200"
+              show-word-limit
+              rows="2"
+            ></el-input>
+          </div>
+        </el-form-item>
+        <p class="p_title_2">2、湿气、气血测试</p>
+        <el-form-item label="(1) 湿气测试（可多选）" prop="moistureDate" class="margin-left">
+        <el-checkbox-group v-model="form.moistureDate">
+          <el-checkbox v-for="moistureItem in moistureDataList" :label="moistureItem.dictValue" :key="moistureItem.dictValue">{{ moistureItem.dictLabel }}</el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+        <el-form-item label="(2) 气血测试（可多选）" prop="bloodData" class="margin-left">
+          <el-checkbox-group v-model="form.bloodData">
+            <el-checkbox v-for="moistureItem in bloodDataList" :label="moistureItem.dictValue" :key="moistureItem.dictValue">{{ moistureItem.dictLabel }}</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+
+      <p class="p_title_2">3、家族疾病史情况</p>
      <el-form-item label="（1）家族疾病史（直系亲属例如爸爸妈妈、爷爷奶奶、外公外婆有相关疾病）（可多选）" prop="familyIllnessHistory" class="margin-left">
        <el-checkbox-group v-model="form.familyIllnessHistory">
          <el-checkbox v-for="(item, index) in healthyData['familyIllnessHistoryArray']" :key="index" :label="item.value" >{{item.name}}</el-checkbox>
@@ -477,7 +510,7 @@
          ></el-input>
          </div>
      </el-form-item>
-      <p class="p_title_2">2、手术情况</p>
+      <p class="p_title_2">4、手术情况</p>
      <el-form-item label="(1) 手术史，因病进行过手术治疗，手术的部分（可多选）" prop="familyIllnessHistory" class="margin-left">
        <el-checkbox-group v-model="form.operationHistory">
          <el-checkbox v-for="(item, index) in healthyData['operationHistoryArray']" :key="index" :label="item.value" >{{item.name}}</el-checkbox>
@@ -508,7 +541,7 @@
          ></el-input>
        </div>
      </el-form-item>
-      <p class="p_title_2">3、药物情况</p>
+      <p class="p_title_2">5、药物情况</p>
      <el-form-item label="(1) 是否长期服用药物（连续服用6个月以上，平均每日服用一次）" prop="longEatDrugFlag" class="margin-left">
        <el-radio-group v-model="form.longEatDrugFlag">
          <el-radio :label="0" key="1">否</el-radio>
@@ -530,7 +563,7 @@
          ></el-input>
          </div>
      </el-form-item>
-      <p class="p_title_2">4、过敏史</p>
+      <p class="p_title_2">6、过敏史</p>
      <el-form-item label="(1) 曾经是否出现过过敏" prop="allergyFlag" class="margin-left">
        <el-radio-group v-model="form.allergyFlag">
          <el-radio :label="0" key="1">无</el-radio>
@@ -585,8 +618,8 @@
            :data="upload.data"
            :auto-upload="false">
            <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
-          <el-button style="margin-left: 10px;" size="small" @click="upload.fileList = []">重置</el-button>
-          <div slot="tip" class="el-upload__tip">提示：最多可上传三份，且每份文件不超过5M</div>
+          <el-button style="margin-left: 10px;" size="small" ref="removeFile" @click="upload.fileList = []">移除文件</el-button>
+          <div slot="tip" class="el-upload__tip">提示：最多可上传三份，且每份文件不超过20M</div>
        </el-upload>
        </el-form-item>
      </div>
@@ -617,7 +650,7 @@
  </section>
 </template>
 <script>
-import { getDictData,addCustomerHealthy } from "@/api/custom/customerInvestigation";
+import { getDictData,addCustomerHealthy,physicalSignsList } from "@/api/custom/customerInvestigation";
 import * as healthyData from "@/utils/healthyData";
 const logo = require("@/assets/logo/st_logo.png");
 export default {
@@ -634,6 +667,9 @@ export default {
      logo,
      submitFlag: false,
      conditioningProjectIdOption:[],
+      physicalSignsList: [],
+      moistureDataList:[],
+      bloodDataList:[],
      stepArray: [true,false,false,false,false,false,false,false,false],
      stepActive: 0,
      form: {
@@ -716,6 +752,10 @@ export default {
        stayupLateFlag: 0,
        stayupLateWeekNum: 0,

+        physicalSignsId:[],
+        otherPhysicalSigns: null,
+        bloodData:[],
+        moistureDate:[],
        familyIllnessHistory:[],
        otherFamilyIllnessHistory:null,
        operationHistory:[],
@@ -730,7 +770,7 @@ export default {
        allergen:[],
        otherAllergen:null,
        medicalReport:[],
-        medicalReportName:"",
+        medicalReportName:[],
        position:0,
        experience: null,
        rebound: 0,
@@ -753,7 +793,7 @@ export default {
          //同时上传文件上限
          limit: 3,
          //每个文件大小
-          fileSize: 1024 * 1024 * 5,
+          fileSize: 1024 * 1024 * 20,
          //是否支持同时选择多张
          multiple: true
      },
@@ -805,29 +845,8 @@ export default {
          ],
        position:[
          { required: true, trigger: "blur", message: "请选择地理位置" }
-        ],
-        /*experience:[
-          { required: true, trigger: "blur", message: "请描述您的减脂经历" }
-        ],
-        difficulty:[
-          { required: true, trigger: "blur", message: "请描述您减脂中遇到的困难" }
-        ],
-          dishesIngredient:[
-            { required: true, trigger: "blur", message: "请描述您忌口、过敏食物" }
-          ]*/
-
-          /*fileList:[
-              {required: true, trigger: "blur", validator: checkReportFile}
-          ]*/
-      },
-        //需要将数组转成字符串的属性名称
-      arrayName:[
-           "condiment","cookingStyle","cookingStyleRate", "washVegetablesStyle","lunchType","dinner","dietFlavor",
-           "snacks","waterType","waterHabit","drinksNum","drinkWineClassify","drinkWineAmount","smokeRate",
-           "workType","defecationTime","aerobicMotionClassify","anaerobicMotionClassify","anaerobicAerobicMotionClassify",
-           "motionField","sleepQuality", "familyIllnessHistory", "operationHistory", "longEatDrugClassify", "allergen", "medicalReport"
-      ]
-
+        ]
+      }
    };
  },
  methods: {
@@ -844,7 +863,7 @@ export default {
            this.submitFlag = true;
            this.form.medicalReport = [];
            if(this.upload.fileList.length > 0){
-                this.$refs.upload.submit();
+                this.$refs.upload.submit();removeFile
            }else{
                this.addCustomerHealthy();
            }
@@ -860,9 +879,9 @@ export default {
    addCustomerHealthy(){
        //数据处理
        let cusMessage = Object.assign({}, this.form);
-        this.arrayName.forEach(function (item, index) {
+        this.healthyData['arrayName'].forEach(function (item, index) {
            cusMessage[item] = cusMessage[item] != null ? cusMessage[item].join(",") : null;
-        })
+        });
        addCustomerHealthy(cusMessage).then((response) => {
            if (response.code === 200) {
                this.$notify({
@@ -875,8 +894,6 @@ export default {
                this.upload.isUploading = false;
            }
        });
-        console.log(cusMessage.cookingStyleRate);
-        console.log(cusMessage.washVegetablesStyle);
    },
    nextStep(step){
      this.$refs.form.validate((valid) => {
@@ -937,8 +954,10 @@ export default {
      },
      // 文件上传成功处理
      handleFileSuccess(response, file, fileList) {
+         console.log(file.name);
          if(response != null && response.code === 200){
              this.form.medicalReport.push(response.fileName);
+              this.form.medicalReportName.push(file.name);
              if(this.form.medicalReport.length === this.upload.fileList.length){
                  //文件全部上传成功，则调用添加客户信息方法
                  this.addCustomerHealthy();
@@ -946,18 +965,39 @@ export default {
          }else{
              this.upload.isUploading = false;
              this.submitFlag = false;
-              this.$message.error('文件上传失败');
+              this.$message.error('文件上传失败，请检查文件格式');
          }
      },
      // 文件上传失败处理
      handleFileFail(err, file, fileList){
-          this.$message.error('文件上传失败');
+          this.$message.error('文件上传失败，请检查文件格式');
          this.upload.isUploading = false;
          this.submitFlag = false;
-      }
+      },
+      //获取湿气
+      getMoistureDictData() {
+        getDictData("sys_blood_data").then((response) => {
+          this.moistureDataList = response.data;
+        });
+      },
+      //获取气血
+      getBloodDictData() {
+        getDictData("sys_moisture_data").then((response) => {
+          this.bloodDataList = response.data;
+        });
+      },
+      /** 查询体征列表 */
+      getPhysicalSignsList() {
+        physicalSignsList().then((response) => {
+          this.physicalSignsList = response.rows;
+        });
+    },
  },
  created() {
    this.getDict("conditioning_project");
+    this.getPhysicalSignsList();
+    this.getMoistureDictData();
+    this.getBloodDictData();
  },
  beforeCreate() {
    document.title = this.$route.meta.title;