Merge remote-tracking branch 'origin/dev'

src/api/system/nurseItem.js

@@ -68,3 +68,9 @@ export function updatePicture(data) {
         data: data
     })
 }
+export function updateShelfStatus(id, shelfStatus) {
+    return request({
+        url: `/system/stationItem/updateShelfStatus?id=${id}&shelfStatus=${shelfStatus}`,
+        method: 'post',
+    })
+}

src/api/system/poser.js

@@ -72,3 +72,10 @@ export function delPoser(nurseStationId, moduleType, nurseItemId) {
         method: 'delete'
     })
 }
+
+export function selectPosterImageJump() {
+    return request({
+        url: '/system/poser/selectPosterImageJump',
+        method: 'GET',
+    })
+}

src/views/system/poser/index.vue

@@ -174,7 +174,7 @@
     <el-dialog
       :title="!isEditFlag ? '添加海报模块信息' : '修改海报模块信息'"
       :visible.sync="open"
-      width="1100px"
+      width="1200px"
       :before-close="cancel"
       append-to-body
     >
@@ -297,16 +297,27 @@
             </el-table-column>
             <el-table-column label="图片跳转标识" align="center" width="300">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.jumpType" placeholder="请选择" style="width: 208px">
+                <el-select
+                  v-model="scope.row.jumpType"
+                  placeholder="请选择"
+                  clearable
+                  style="width: 208px"
+                >
                   <el-option
                     v-for="item in jumpTypes"
-                    :key="item.value"
+                    :key="item.dictValue"
-                    :label="item.label"
+                    :label="item.dictLabel"
-                    :value="item.value"
+                    :value="item.dictValue"
+                    @click.native="taptypes(scope.row,item)"
                   ></el-option>
                 </el-select>
               </template>
             </el-table-column>
+            <el-table-column label="图片跳转链接" align="center" width="300">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.jumpLink" placeholder="请输入跳转链接" style="widt h:250px"></el-input>
+              </template>
+            </el-table-column>
             <el-table-column label="操作" align="center" width="250">
               <template slot-scope="scope">
                 <el-button size="mini" type="text" @click="addPictureUrl">新增</el-button>
@@ -473,7 +484,8 @@ import {
   getListByUser,
   getListBy,
   updatePoser,
-  updatePicture
+  updatePicture,
+  selectPosterImageJump
 } from "@/api/system/poser";
 import { list } from "@/api/system/nurseItem";
 import stationAcatar from "../stationAvatar/index.vue";
@@ -518,6 +530,7 @@ export default {
       poserList: [],
       // 存储新上传的图片数组
       deletNewImgs: [],
+      jumpTypes: [],
       objitem: [],
       nurseItemList: [],
       // 弹出层判断新增还是修改
@@ -607,20 +620,6 @@ export default {
         // },
       ],
       imgsurl: { pictureUrlList: [] },
-      jumpTypes: [
-        {
-          value: "NEW_PEOPLE_WELFARE",
-          label: "新人福利"
-        },
-        {
-          value: "HOME_PAGE",
-          label: "首页"
-        },
-        {
-          value: "SHOPPING",
-          label: "商城"
-        }
-      ],
       //页面链接
       stationid: "",
       imgone: "",
@@ -641,8 +640,18 @@ export default {
   created() {
     this.videourl = baseurl + "/system/station/updateNurseStationHeads";
     this.info();
+    this.PosterImageJump();
   },
   methods: {
+    taptypes(row, e) {
+      row.jumpDictId = e.dictCode;
+    },
+    //类型字典
+    PosterImageJump() {
+      selectPosterImageJump().then(res => {
+        this.jumpTypes = res.data;
+      });
+    },
     nurseStationidchange(e) {
       this.nurseItemquery.nurseStationId = e;
       this.queryParams.nurseItemName = "";
@@ -651,7 +660,6 @@ export default {
     },
     //删除海报图片列表
     delPictureUrl(item) {
-      console.log(item);
       if (item.idd && !item.id) {
         if (this.form.posterPictureUrlLists.length == 1) {
           this.$message.error("最后一条不可删除");
@@ -674,9 +682,11 @@ export default {
     addPictureUrl() {
       this.idd++;
       var obj = {
-        posterPictureUrl: "",
+        posterPictureUrl: null,
-        jumpType: "",
+        jumpType: null,
-        idd: this.idd
+        idd: this.idd,
+        jumpLink: null,
+        jumpDictId: null
       };
       if (this.form.posterPictureUrlLists.length >= 5) {
         this.$message.error("最多新增5条");
@@ -836,7 +846,6 @@ export default {
           obj.pictureUrlList.push(e.posterPictureUrl);
         });
       }
-      console.log(this.deletNewImgs);
       if (obj.pictureUrlList.length > 0) {
         updatePicture({ pictureUrlList: this.deletNewImgs }).then(res => {
           this.open = false;
@@ -853,16 +862,18 @@ export default {
       this.form = {
         posterPictureUrlLists: [
           {
-            posterPictureUrl: "",
+            posterPictureUrl: null,
-            jumpType: "",
+            jumpType: null,
-            idd: this.idd
+            idd: this.idd,
+            jumpLink: null,
+            jumpDictId: null
           }
         ],
+        moduleType: null,
         id: null,
         poserName: null,
         posterPictureUrl: null,
         posterVideoUrl: null,
-        posterVideoUrl2: null,
         poserSort: null,
         nurseStationName: "请选择所属护理站",
         nurseStationId: null,
@@ -922,6 +933,11 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      this.form.posterPictureUrlLists.forEach(e => {
+        if (!e.jumpType || e.jumpType == "") {
+          e.jumpDictId = null;
+        }
+      });
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {

src/views/system/stationItem/index.vue

@@ -9,8 +9,7 @@
       label-width="110px"
     >
       <el-form-item label="护理站名称" prop="nurseStationId" label-width="100px">
-        <el-select v-model="queryParams.nurseStationId" placeholder="请选择护理站"
+        <el-select v-model="queryParams.nurseStationId" placeholder="请选择护理站" @change="handleQuery">
-        @change="handleQuery">
           <el-option
             v-for="item in handstationlist"
             :key="item.id"
@@ -112,6 +111,16 @@
       <el-table-column label="护理项目编号" align="center" prop="nurseItemCode" />
       <el-table-column label="护理项目名称" align="center" prop="nurseItemName" />
       <el-table-column label="护理项目分类名称" align="center" prop="classifyName" />
+      <el-table-column label="上架状态" align="center" prop="whetherShelf">
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.shelfStatus"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            @change="upwhetherShelf(scope.row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -582,7 +591,8 @@ import {
   delNurseItem,
   addNurseItem,
   updateNurseItem,
-  updatePicture
+  updatePicture,
+  updateShelfStatus
 } from "@/api/system/nurseItem";
 import { getToken } from "@/utils/auth";
 import { getListByUser } from "@/api/system/userlist.js";
@@ -764,6 +774,23 @@ export default {
     this.classifylistInfo();
   },
   methods: {
+    //点击上架
+    upwhetherShelf(row) {
+      let shelfStatus = null;
+      if (row.shelfStatus == false) {
+        shelfStatus = "NOT_SHELF";
+      } else if (row.shelfStatus == true) {
+        shelfStatus = "SHELF";
+      }
+      updateShelfStatus(row.id, shelfStatus).then(res => {
+        if (row.shelfStatus == false) {
+          this.$modal.msgSuccess("已修改上架状态为未上架");
+        } else {
+          this.$modal.msgSuccess("已修改上架状态为上架");
+        }
+        this.getList();
+      });
+    },
     //// //护理项目list
     //打开遮罩层
     clickClassifyshow() {
@@ -934,6 +961,13 @@ export default {
     getList() {
       this.loading = true;
       list(this.queryParams).then(response => {
+        response.rows.forEach(e => {
+          if (e.shelfStatus == "SHELF") {
+            e.shelfStatus = true;
+          } else {
+            e.shelfStatus = false;
+          }
+        });
         this.nurseItemList = response.rows;
         this.total = response.total;
         this.loading = false;