二维码设置修改

pages/search/search.vue

@@ -9,10 +9,10 @@
       <scroll-view class="keyword-list-box" v-show="isShowKeywordList" scroll-y>
         <block v-for="(row, index) in keywordList" :key="index">
           <view class="keyword-entry" hover-class="keyword-entry-tap">
-            <view class="keyword-text" @tap.stop="doSearch(keywordList[index].keyword)">
+            <view class="keyword-text" @tap.stop="doSearch(row)">
               <rich-text :nodes="row.htmlStr"></rich-text>
             </view>
-            <view class="keyword-img" @tap.stop="doSearch(keywordList[index].keyword)">
+            <view class="keyword-img" @tap.stop="doSearch(row)">
               <image src="/static/HM-search/back.png"></image>
             </view>
           </view>
@@ -73,6 +73,7 @@
         uniName: '',
         queryDept: '',
         queryDeptId: '',
+        sourceQr: '',
         qrCode: '',
         // 设置科室二维码 end
         // 选择血制品送达科室 start
@@ -115,6 +116,7 @@
         this.uniName = options.uniName;
         this.queryDept = options.queryDept;
         this.queryDeptId = options.queryDeptId;
+        this.sourceQr = options.sourceQr;
         this.qrCode = options.qrCode;
         this.sysDeptType = -1;
       }  else if (this.type == "pharmacy") { //药房切换科室
@@ -224,15 +226,34 @@
             }
           }
         }
+        
+        // 设置二维码
+        if(this.type == "settingCode"){
+          postData = {
+            hosId: this.hosId,
+            searchKey: keyword,
+          }
+        }
+        
         uni.showLoading({
           title: "加载中",
         });
-        post("/data/fetchDataList/department", postData).then((res) => {
-          if (res.status == 200) {
-            this.searchData.push({
-              name: keyword,
-              list: res.list
-            });
+        
+        post(this.type == "settingCode" ? "/dept/queryChangeDept" : "/data/fetchDataList/department", postData).then((res) => {
+          if (res.status == 200 || res.state == 200) {
+            if(this.type == "settingCode"){
+              let deptList = res.deptList.map(v => ({...v, sign: 'dept'}));
+              let qrList = res.qrList.map(v => ({...v.deptDTO, sign: 'qr', qrId: v.id}));
+              this.searchData.push({
+                name: keyword,
+                list: deptList.concat(qrList)
+              });
+            }else{
+              this.searchData.push({
+                name: keyword,
+                list: res.list
+              });
+            }
             let searchText = this.searchText.detail ? this.searchText.detail.value : this.searchText;
             let index = this.searchData.findIndex(item => item.name === searchText);
             this.deptList = index >= 0 ? this.searchData[index].list : [];
@@ -256,10 +277,12 @@
           //定义高亮#9f9f9f
           var html = row.dept.replace(
             keyword,
-            "<span style='color: #9f9f9f;'>" + keyword + "</span>"
+            "<span style='color: #9f9f9f;'>" + keyword + "</span>" + (row.sign == 'qr' ? '<span class="red">（配置）</span>' : '')
           );
           html = "<div>" + html + "</div>";
           var tmpObj = {
+            id: row.id,
+            qrId: row.qrId,
             keyword: row.dept,
             htmlStr: html,
           };
@@ -321,11 +344,12 @@
         });
       },
       //执行搜索
-      doSearch(keyword) {
-        keyword = keyword === false ? this.keyword : keyword;
+      doSearch(data) {
+        console.log(data);
+        let keyword = keyword === false ? this.keyword : data.keyword;
         this.keyword = keyword;
         this.saveKeyword(keyword); //保存为历史
-        let arr = this.deptList.filter((item) => item.dept === keyword);
+        let arr = this.deptList.filter((item) => data.qrId ? (item.qrId === data.qrId) : (item.dept === keyword));
         if (arr.length) {
           let msg = "";
           if (this.type == "patientInformationList" || this.type == "inspectList" || this.type == "pharmacy") {
@@ -388,12 +412,13 @@
             });
           } else if (this.type == "settingCode") {
             if (this.queryDept) { //替换
+              console.log(arr);
               uni.navigateTo({
-                url: `../settingCode/settingCode?targetId=${arr[0].id}&targetDept=${arr[0].dept}&uniName=${this.uniName}&queryDept=${this.queryDept}&queryDeptId=${this.queryDeptId}&qrCode=${this.qrCode}`,
+                url: `../settingCode/settingCode?destQr=${arr[0].qrId || ''}&targetId=${arr[0].id}&targetDept=${arr[0].dept}&uniName=${this.uniName}&queryDept=${this.queryDept}&queryDeptId=${this.queryDeptId}&sourceQr=${this.sourceQr || ''}&qrCode=${this.qrCode}`,
               });
             } else { //设置
               uni.navigateTo({
-                url: `../settingCode/settingCode?targetId=${arr[0].id}&targetDept=${arr[0].dept}&uniName=${this.uniName}&qrCode=${this.qrCode}`,
+                url: `../settingCode/settingCode?qrId=${arr[0].qrId || ''}&targetId=${arr[0].id}&targetDept=${arr[0].dept}&uniName=${this.uniName}&qrCode=${this.qrCode}`,
               });
             }
           }

pages/settingCode/settingCode.vue

@@ -5,7 +5,8 @@
     </view>
     <view class="scanFont">可通过扫一扫功能设置科室，扫描二维码后设置或替换科室</view>
     <view class="scanFont nr">
-      <text>查询科室结果：{{queryDept?queryDept.dept:"无"}}</text>
+      <text v-if="queryDept">查询科室结果：{{queryDept.dept}}<text v-if="queryDept.sourceQr" class="red">（配置）</text></text>
+      <text v-else>查询科室结果：无</text>
     </view>
     <view class="scanFont nr red">{{msg}}</view>
     <footTool :settings="settings" @operate="operate"></footTool>
@@ -64,8 +65,10 @@
           let postData = {
             "type": "update",
             "qrCode": this.qrCode,
-            "destDept": this.options.targetId,
-            "sourceDept": this.queryDept.id
+            "sourceQr": this.queryDept.sourceQr ? +this.queryDept.sourceQr : undefined,
+            "destQr": this.options.destQr ? +this.options.destQr : undefined,
+            "sourceDept": this.queryDept.sourceQr ? undefined : +this.queryDept.id,
+            "destDept": this.options.destQr ? undefined : +this.options.targetId,
           };
           post("/dept/scanChangeDept", postData).then((res) => {
             uni.hideLoading();
@@ -90,7 +93,8 @@
           let postData = {
             "type": "save",
             "qrCode": this.qrCode,
-            "destDept": this.options.targetId
+            "destDept": +this.options.targetId,
+            "qrId": this.options.qrId ? +this.options.qrId : undefined,
           }
           post("/dept/scanChangeDept", postData).then((res) => {
             uni.hideLoading();
@@ -122,7 +126,7 @@
         console.log(i,this.settings,'seimin')
         if (this.settings[i].uniName == 'replaceGo') { //替换,去选择科室
           uni.navigateTo({
-            url: `../search/search?type=settingCode&uniName=${this.settings[i].uniName}&queryDept=${this.queryDept.dept}&queryDeptId=${this.queryDept.id}&qrCode=${this.qrCode}`,
+            url: `../search/search?type=settingCode&uniName=${this.settings[i].uniName}&queryDept=${this.queryDept.dept}&queryDeptId=${this.queryDept.id}&sourceQr=${this.queryDept.sourceQr || ''}&qrCode=${this.qrCode}`,
           });
         } else if (this.settings[i].uniName == 'settingGo') { //设置,去选择科室
           uni.navigateTo({
@@ -175,10 +179,18 @@
             uni.hideLoading();
             if (res.status == 200) {
               if (res.data) { //替换
-                this.queryDept = {
-                  dept: res.data.dept,
-                  id: res.data.id
-                };
+                if(res.data.deptDTO){
+                  this.queryDept = {
+                    dept: res.data.deptDTO.dept,
+                    id: res.data.deptDTO.id,
+                    sourceQr: res.data.id,
+                  };
+                }else{
+                  this.queryDept = {
+                    dept: res.data.dept,
+                    id: res.data.id
+                  };
+                }
                 this.settings = [{
                   name: '替换',
                   uniName: 'replaceGo'
@@ -212,7 +224,8 @@
         this.qrCode = options.qrCode
         this.queryDept = {
           dept: options.queryDept,
-          id: options.queryDeptId
+          id: options.queryDeptId,
+          sourceQr: options.sourceQr,
         };
         this.msg = `此二维码绑定${options.targetDept}成功，${this.queryDept.dept}的二维码被清空`;
         this.settings = [{