客户档案调整

stdiet-custom/src/main/resources/mapper/custom/SysCustomerMapper.xml

@@ -37,6 +37,7 @@
         where del_flag = 0
         <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
         <if test="phone != null  and phone != ''"> and phone like concat('%', #{phone}, '%')</if>
+        <if test="fansChannel != null "> and fans_channel = #{fansChannel}</if>
         order by create_time desc
     </select>
 

stdiet-ui/src/components/ContractDrawer/index.vue

@@ -70,7 +70,7 @@
                 >复制
               </el-button>
               <el-popover placement="top" trigger="click">
-                <VueQr :text="copyValue" :logoSrc="logo" size="256" />
+                <VueQr :text="copyValue" :logoSrc="logo" :size="256" />
                 <el-button
                   slot="reference"
                   icon="el-icon-picture-outline"

stdiet-ui/src/components/HeatStatisticsDrawer/index.vue

@@ -25,7 +25,7 @@
               trigger="click"
               style="margin: 0 12px"
             >
-              <VueQr :text="copyValue" :logoSrc="logo" size="256" />
+              <VueQr :text="copyValue" :logoSrc="logo" :size="256" />
               <el-button
                 slot="reference"
                 size="mini"

stdiet-ui/src/components/PhysicalSignsDialog/index.vue

@@ -201,7 +201,7 @@
           v-show="dataList.length == 0"
           style="font-size: 20px; text-align: center"
         >
-          <VueQr :text="copyValue" :logoSrc="logo" size="256"/>
+          <VueQr :text="copyValue" :logoSrc="logo" :size="256" />
           <div style="text-align: center; margin-top: 20px">
             <el-button
               icon="el-icon-share"
@@ -689,6 +689,28 @@ export default {
             ? medicalReportNameArray[2]
             : "体检报告（3）"
           : "";
+      detailHealthy.moistureDate = detailHealthy.moistureDate
+        .split(",")
+        .reduce((arr, cur) => {
+          const tarData = healthyData.moistureDateArray.find(
+            (obj) => obj.value === cur
+          );
+          if (tarData) {
+            arr.push(tarData.name);
+          }
+          return arr;
+        }, []);
+      detailHealthy.bloodData = detailHealthy.bloodData
+        .split(",")
+        .reduce((arr, cur) => {
+          const tarData = healthyData.bloodDataArray.find(
+            (obj) => obj.value === cur
+          );
+          if (tarData) {
+            arr.push(tarData.name);
+          }
+          return arr;
+        }, []);
       this.detailHealthy = detailHealthy;
       for (let i = 0; i < this.healthyTitleData.length; i++) {
         let stepArray = [];

stdiet-ui/src/components/RecipesPlanDrawer/index.vue

@@ -25,7 +25,7 @@
             v-if="cusOutId"
             style="margin: 0 12px"
           >
-            <VueQr :text="copyValue" :logoSrc="logo" size="256" />
+            <VueQr :text="copyValue" :logoSrc="logo" :size="256" />
             <el-button
               slot="reference"
               size="mini"

stdiet-ui/src/views/custom/contract/index.vue

@@ -198,7 +198,7 @@
             >复制
           </el-button>
           <el-popover placement="top" trigger="click">
-            <VueQr :text="copyValue" :logoSrc="logo" size="256"/>
+            <VueQr :text="copyValue" :logoSrc="logo" :size="256"/>
             <el-button
               slot="reference"
               icon="el-icon-picture-outline"

stdiet-ui/src/views/custom/customer/index.vue

@@ -25,16 +25,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!--<el-form-item label="主营养师" prop="mainDietitian">
+      <el-form-item label="进粉渠道" prop="fansChannel">
-        <el-input
+        <el-select v-model="queryParams.fansChannel" placeholder="请选择">
-          v-model="queryParams.mainDietitian"
+          <el-option
-          placeholder="请输入主营养师"
+            v-for="dict in fansChannelOptions"
-          clearable
+            :key="dict.dictValue"
-          size="small"
+            :label="dict.dictLabel"
-          @keyup.enter.native="handleQuery"
+            :value="parseInt(dict.dictValue)"
-        />
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="营养师助理" prop="assistantDietitian">
+      <!--<el-form-item label="营养师助理" prop="assistantDietitian">
         <el-input
           v-model="queryParams.assistantDietitian"
           placeholder="请输入营养师助理"
@@ -430,6 +431,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        fansChannel: null,
         name: null,
         phone: null,
         mainDietitian: null,

stdiet-ui/src/views/custom/recipesBuild/VerifyView/index.vue

@@ -87,7 +87,7 @@ export default {
         this.setNotRecIgds({ data: [] });
       }
 
-      this.selectedIgd = data.id;
+      this.selectedIgd = data.id === this.selectedIgd ? 0 : data.id;
 
       this.setNotRecIgds({ data: [this.selectedIgd] });
     },

stdiet-ui/src/views/custom/recipesPlan/index.vue

@@ -200,6 +200,7 @@ export default {
       orderDialog: undefined,
       reviewStatusOptions: [
         { dictValue: 0, dictLabel: "未制作" },
+        { dictValue: 3, dictLabel: "制作中" },
         { dictValue: 1, dictLabel: "未审核" },
         { dictValue: 2, dictLabel: "已审核" },
       ],