Merge remote-tracking branch 'origin/dev' into dev

src/views/manage/script/index.vue

@@ -82,18 +82,6 @@
           >新增</el-button
         >
       </el-col>
-
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['manage:script:export']"
-          >导出</el-button
-        >
-      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -139,7 +127,6 @@
           :data="scriptList"
           @selection-change="handleSelectionChange"
         >
-          <!-- <el-table-column type="selection" width="55" align="center" /> -->
           <el-table-column
             label="序号"
             align="center"
@@ -196,6 +183,13 @@
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-search"
+                @click="handlesee(scope.row)"
+                >预览</el-button
+              >
               <el-button
                 size="mini"
                 type="text"
@@ -204,13 +198,6 @@
                 v-hasPermi="['manage:script:edit']"
                 >修改</el-button
               >
-              <!-- <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-notebook-2"
-                @click="management(scope.row)"
-                >分类管理</el-button
-              > -->
               <el-button
                 size="mini"
                 type="text"
@@ -234,7 +221,7 @@
     />
 
     <!-- 添加或修改话术信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body v-if="open">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="通用话术名称" prop="commonScriptName">
           <el-input
@@ -345,11 +332,11 @@
             >{{ diseaseTypeName }}</el-button
           >
         </el-form-item>
-        <el-form-item label="图片" prop="platformId">
+        <el-form-item label="图片" prop="scriptFilePath">
           <stationAcatar
             @imgUrl="imgUrl"
-            :img="form.propagandaCoverPath"
-            :type="'propagandaCoverUrl'"
+            :img="form.scriptFilePath"
+            :type="'scriptUrl'"
           />
         </el-form-item>
       </el-form>
@@ -511,6 +498,18 @@
         @pagination="infodisease"
       />
     </el-dialog>
+    <!-- 预览弹框 -->
+    <el-dialog
+      title="提示"
+      :visible.sync="dialogsee"
+      width="30%"
+      :before-close="seeClose"
+    >
+      <img :src="baseUrl + form.scriptFilePath" alt="" />
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogsee = false">取 消</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -602,7 +601,11 @@ export default {
         value: 'SUSPEND',
         label: '暂停'
       },],
+      baseUrl: process.env.VUE_APP_BASE_API,
 
+
+      //预览弹框
+      dialogsee: false,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -725,7 +728,20 @@ export default {
   methods: {
     // 上传图片
     imgUrl(imgUrl) {
-      this.form.propagandaCoverPath = imgUrl;
+      this.form.scriptFilePath = imgUrl;
+    },
+    // 预览点击
+    handlesee(row) {
+      const id = row.id
+      getScript(id).then(response => {
+        this.form = response.data;
+        this.dialogsee = true;
+      });
+    },
+
+    // 预览关闭
+    seeClose() {
+      this.dialogsee = false;
     },
     // 点击科室
     clickinnerVisible() {
@@ -871,6 +887,7 @@ export default {
         diseaseTypeName: null,
         diseaseTypeCode: null,
         commonScriptName: null,
+        scriptFilePath:null,
         scriptName: null,
         scriptId: null,
         platformId: null,

src/views/manage/servicepackage/index.vue

@@ -52,6 +52,7 @@
       </el-form-item>
       <el-form-item label="服务包价格" prop="packagePrice">
         <el-input
+        oninput="value=value.replace(/[^\d.]/g,'')" 
           v-model="queryParams.packagePrice"
           placeholder="请输入服务包价格"
           clearable
@@ -175,7 +176,11 @@
             align="center"
             prop="packageVersion"
           />
-          <el-table-column label="服务期限" align="center" prop="packageTermAndUnit" />
+          <el-table-column
+            label="服务期限"
+            align="center"
+            prop="packageTermAndUnit"
+          />
           <el-table-column
             label="服务包简介"
             align="center"
@@ -217,7 +222,6 @@
                 icon="el-icon-s-promotion"
                 @click="release(scope.row)"
                 v-if="scope.row.whetherRelease == 0"
-
                 >发布</el-button
               >
               <el-button
@@ -226,7 +230,6 @@
                 icon="el-icon-notebook-2
 "
                 @click="detail(scope.row)"
-
                 >详情</el-button
               >
               <el-button
@@ -332,11 +335,7 @@
         <el-form-item label="服务包名称" prop="packageName">
           <el-input v-model="form.packageName" placeholder="请输入服务包名称" />
         </el-form-item>
-        <el-form-item
-          label="服务包简介"
-          prop="packageIntroduction"
-    
-        >
+        <el-form-item label="服务包简介" prop="packageIntroduction">
           <el-input
             v-model="form.packageIntroduction"
             placeholder="请输入服务包简介"
@@ -344,6 +343,7 @@
         </el-form-item>
         <el-form-item label="服务包价格" prop="packagePrice">
           <el-input
+          oninput="value=value.replace(/[^\d.]/g,'')" 
             v-model="form.packagePrice"
             placeholder="请输入服务包价格"
             style="width: 204px"
@@ -351,21 +351,13 @@
             <template slot="append">元</template>
           </el-input>
         </el-form-item>
-        <el-form-item
-          label="服务包版本"
-          prop="packageVersion"
-        
-        >
+        <el-form-item label="服务包版本" prop="packageVersion">
           <el-input
             v-model="form.packageVersion"
             placeholder="请输入服务包版本"
           />
         </el-form-item>
-        <el-form-item
-          label="硬件类型"
-          prop="hardwareType"
-
-        >
+        <el-form-item label="硬件类型" prop="hardwareType">
           <el-select
             v-model="form.hardwareType"
             placeholder="请选择"
@@ -381,9 +373,9 @@
           </el-select>
         </el-form-item>
         <el-form-item label="服务包期限" prop="packageTerm">
-          <el-input v-model="form.packageTerm" placeholder="请输入服务包期限">
+          <el-input v-model="form.packageTerm" placeholder="请输入服务包期限" style="width: 208px">
             <el-select
-              style="width: 100px"
+              style="width: 60px"
               slot="append"
               v-model="form.packageTermUnit"
               placeholder="请选择"
@@ -401,14 +393,16 @@
         </el-form-item>
         <br />
         <div v-for="(aitem, index) in form.voList" :key="index">
-
           <el-form-item
             label="服务包内容"
             :rules="rules.voList.serviceWayName"
             :prop="`voList.${index}.serviceWayName`"
           >
-            <el-select v-model="aitem.serviceWayName" placeholder="请选择服务方式" @change="changeway">
- 
+            <el-select
+              v-model="aitem.serviceWayName"
+              placeholder="请选择服务方式"
+              @change="changeway"
+            >
               <el-option
                 v-for="item in optionsway"
                 :key="item.id"
@@ -422,8 +416,12 @@
               :rules="rules.voList.serviceContent"
               :prop="`voList.${index}.serviceContent`"
             >
-            <el-select v-model="aitem.serviceContent" placeholder="请选择服务内容"  @change="changcontent">
-
+              <el-select
+              style="margin-left:10px"
+                v-model="aitem.serviceContent"
+                placeholder="请选择服务内容"
+                @change="changcontent"
+              >
                 <el-option
                   v-for="item in optionscontent"
                   :key="item.id"
@@ -438,7 +436,10 @@
               :rules="rules.voList.serviceFrequencyText"
               :prop="`voList.${index}.serviceFrequencyText`"
             >
-            <el-select v-model="aitem.serviceFrequencyText" placeholder="请选择服务频次"> 
+              <el-select
+                v-model="aitem.serviceFrequencyText"
+                placeholder="请选择服务频次"
+              >
                 <el-option
                   v-for="item in optionsfrequency"
                   :key="item.id"
@@ -448,7 +449,6 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            
           </el-form-item>
           <el-button
             type="primary"
@@ -480,7 +480,12 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitFormadd" v-if="title == '复制服务包基础信息'">确 定</el-button>
+        <el-button
+          type="primary"
+          @click="submitFormadd"
+          v-if="title == '复制服务包基础信息'"
+          >确 定</el-button
+        >
         <el-button type="primary" @click="submitForm" v-else>确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
@@ -643,60 +648,40 @@
       title="详情"
       :visible.sync="detailshow"
       width="50%"
-  :before-close="handleClose">
+      :before-close="handleClose"
+    >
       <el-form
         ref="form"
         :model="formdetail"
         label-width="150px"
         :inline="true"
       >
-      <el-form-item
-          label="病种名称:"
-          prop="packageVersion"
-        
-        >
+        <el-form-item label="病种名称:" prop="packageVersion">
           <span>{{ formdetail.diseaseTypeName }}</span>
         </el-form-item>
-      <el-form-item
-          label="服务包名称:"
-          prop="packageVersion"
-        
-        >
+        <el-form-item label="服务包名称:" prop="packageVersion">
           <span>{{ formdetail.packageName }}</span>
         </el-form-item>
-      <el-form-item
-          label="价格:"
-          prop="packageVersion"
-        
-        >
+        <el-form-item label="价格:" prop="packageVersion">
           <span>{{ formdetail.packagePrice }}</span>
         </el-form-item>
-      <el-form-item
-          label="服务期限:"
-          prop="packageVersion"
-        
-        >
+        <el-form-item label="服务期限:" prop="packageVersion">
           <span>{{ formdetail.packageTermAndUnit }}</span>
         </el-form-item>
-      <el-form-item
-          label="硬件类型:"
-          prop="packageVersion"
-        
-        >
-        <span>{{formdetail.hardwareType=="BLOOD_PRESSURE"?'血压仪':''}}</span>
-        <span>{{formdetail.hardwareType=="GLUCOSE_METER"?'血糖仪':''}}</span>
-        <span>{{formdetail.hardwareType=="ELECTROCARDIOGRA"?'心电仪':''}}</span>
+        <el-form-item label="硬件类型:" prop="packageVersion">
+          <span>{{
+            formdetail.hardwareType == "BLOOD_PRESSURE" ? "血压仪" : ""
+          }}</span>
+          <span>{{
+            formdetail.hardwareType == "GLUCOSE_METER" ? "血糖仪" : ""
+          }}</span>
+          <span>{{
+            formdetail.hardwareType == "ELECTROCARDIOGRA" ? "心电仪" : ""
+          }}</span>
         </el-form-item>
-
       </el-form>
-  <el-table
-          v-loading="loading"
-          :data="datailList"
-        >
-        <el-table-column
-            label="序号"
-            type="index"
-          />
+      <el-table v-loading="loading" :data="datailList">
+        <el-table-column label="序号" type="index" />
         <el-table-column
           label="服务方式"
           align="center"
@@ -708,7 +693,11 @@
           prop="serviceContent"
           :show-overflow-tooltip="true"
         />
-          <el-table-column label="服务频次" align="center" prop="serviceFrequencyText" />
+        <el-table-column
+          label="服务频次"
+          align="center"
+          prop="serviceFrequencyText"
+        />
       </el-table>
       <span slot="footer" class="dialog-footer">
         <el-button @click="detailshow = false">关闭</el-button>
@@ -789,8 +778,10 @@ export default {
       optionscontent: [],
       // 服务频次
       optionsfrequency: [
-        {  value: '',
-        label: ''}
+        {
+          value: '',
+          label: ''
+        }
       ],
 
       optionstype: [{
@@ -939,22 +930,18 @@ this.$set(this.form,'packageTermUnit',e);
 
           }
         })
-      console.log(this.datailList)
-
       });
     },
     // 详情关闭
     handleClose() {
       this.detailshow = false
     },
-
     // 发布
     release(row) {
       this.examineid = row.id
       this.dialogexamine = true
     },
     // 发布同意按钮
-
     cancelamine() {
       var propagandaStatus = 1
       editReleaseStatus(this.examineid, propagandaStatus).then(response => {
@@ -968,7 +955,6 @@ this.$set(this.form,'packageTermUnit',e);
 
     },
     // 发布关闭按钮
-
     amineClose() {
       this.dialogexamine = false
     },
@@ -997,9 +983,6 @@ this.$set(this.form,'packageTermUnit',e);
       var obj = {
         serviceWayName: null,
         serviceContent: null,
-        // serviceFrequencyText:"",
-        // serviceFrequencyStart: null,
-        // serviceFrequencyEnd:null,
         idd: this.idd
       };
       if (this.form.voList.length == 5) {
@@ -1018,12 +1001,10 @@ this.$set(this.form,'packageTermUnit',e);
         this.loading = false;
       });
     },
-
     // 查询服务方式
     getserviceWayList() {
       serviceWayList().then(response => {
         this.optionsway = response.data;
-
       });
     },
     // 服务方式点击事件
@@ -1033,22 +1014,19 @@ this.$set(this.form,'packageTermUnit',e);
       serviccontent(id).then(response => {
         this.optionscontent = response.rows;
       });
-      console.log(e,'00000')
+      this.form.voList.serviceContent='';
     },
     // 服务内容点击事件
     changcontent(e) {
       var id = null
       id = this.optionscontent.find(f => f.serviceContent == e).id
       this.optionsfrequency = this.optionscontent.find(f => f.id == id).serviceWayFrequencyList
-      console.log(this.optionsfrequency,'777777')
       this.optionsfrequency.forEach(el => {
         if (el.serviceFrequencyType == "DIGIT") {
           el.serviceFrequencyText = el.serviceFrequencyStart + '~' + el.serviceFrequencyEnd
 
         } else if (el.serviceFrequencyType == "serviceFrequencyType") {
           this.optionsfrequency = this.optionscontent.find(f => f.id == e).serviceWayFrequencyList
-      console.log(this.optionsfrequency,'00000')
-
         }
       })
     },
@@ -1081,7 +1059,6 @@ this.$set(this.form,'packageTermUnit',e);
         this.queryParams.departmentId = ''
         this.itemname = null
         this.getList()
-
       }
     },
     // 点击科室