morphone1995 vor 4 Jahren
Ursprung
Commit
2c47aabf2e

+ 16 - 5
src/components/icss/dept/AddDept.vue

@@ -1,6 +1,11 @@
 <template>
   <div class="AddChemicalAndCommonMappingWrapper clearfix" @click="close">
-    <crumbs  :title="isEdit ? '科室关联维护--修改关联' : '科室关联维护--添加关联'" class="topBack" :param="$route.params" linkTo="DeptManage"></crumbs>
+    <crumbs
+      :title="isEdit ? '科室关联维护--修改关联' : '科室关联维护--添加关联'"
+      class="topBack"
+      :param="$route.params"
+      linkTo="DeptManage"
+    ></crumbs>
     <div class="AddChemicalAndCommonMappingBox clearfix">
       <div class="titleBox clearfix">
         <p class="title">医院术语</p>
@@ -48,7 +53,7 @@
     </div>
     <div class="btn">
       <!-- <span class="sumbit" @click="submitForm">建立关联</span> -->
-      <el-button type="primary" :disabled="saveDisable" @click="submitForm">建立关联</el-button>
+      <el-button type="primary" :disabled="saveDisable" @click="submitForm">确定</el-button>
     </div>
   </div>
 </template>
@@ -108,11 +113,11 @@ export default {
         this.getAllLisConcept();
       }
     },
-   
+
     // 标准术语搜索列表
     getAllLisConcept() {
       let params = {
-        type: 7,  //科室
+        type: 7, //科室
         inputStr: this.uniqueText,
         sex: 3,
         age: 0
@@ -197,7 +202,7 @@ export default {
             if (this.isEdit) {
               params = { ...params, id: this.editId };
             }
-            this.saveLisMapping(params, '关联建立成功', 'success');
+            this.saveLisMapping(params, this.isEdit ? '编辑成功' : '添加成功', 'success');
           } else {
             // 已存在,提示修改
             // this.showConfirmDialog('该关联已存在是否替换旧的关系信息', () => {
@@ -219,6 +224,12 @@ export default {
           this.warning(res.data.msg || msg, type);
           // this.$router.push({name: 'ChemicalAndCommonMapping'});
           this.initForm();
+          this.$router.push({
+            name: 'DeptManage',
+            params: Object.assign({}, this.$route.params, {
+              currentPage: 1
+            })
+          });
         } else {
           this.warning(res.data.msg);
         }

+ 11 - 2
src/components/icss/disease/AddChemicalAndCommonMapping.vue

@@ -100,7 +100,7 @@
     </div>
     <div class="btn">
       <!-- <span class="sumbit" @click="submitForm">建立关联</span> -->
-      <el-button type="primary" :disabled="saveDisable" @click="submitForm">建立关联</el-button>
+      <el-button type="primary" :disabled="saveDisable" @click="submitForm">确定</el-button>
     </div>
   </div>
 </template>
@@ -261,6 +261,9 @@ export default {
         hisName: mealText,
         uniqueName: uniqueName
       };
+      if (this.isEdit) {
+        params = { ...params, id: this.editId };
+      }
       this.showSaveDialog(params);
     },
     // 建立关联-映射关系是否已存在
@@ -275,7 +278,7 @@ export default {
             if (this.isEdit) {
               params = { ...params, id: this.editId };
             }
-            this.saveLisMapping(params, '关联建立成功', 'success');
+            this.saveLisMapping(params,  this.isEdit ? '编辑成功' : '添加成功', 'success');
           } else {
             // 已存在,提示修改
             // this.showConfirmDialog('该关联已存在是否替换旧的关系信息', () => {
@@ -297,6 +300,12 @@ export default {
           this.warning(res.data.msg || msg, type);
           // this.$router.push({name: 'ChemicalAndCommonMapping'});
           this.initForm();
+          this.$router.push({
+            name: 'ChemicalAndCommonMapping',
+            params: Object.assign({}, this.$route.params, {
+              currentPage: 1
+            })
+          });
         } else {
           this.warning(res.data.msg);
         }

+ 15 - 4
src/components/icss/drug/AddDrug.vue

@@ -1,6 +1,11 @@
 <template>
   <div class="AddChemicalAndCommonMappingWrapper clearfix" @click="close">
-    <crumbs  :title="isEdit ? '药品关联维护--修改关联' : '药品关联维护--添加关联'" class="topBack" :param="$route.params" linkTo="DrugManage"></crumbs>
+    <crumbs
+      :title="isEdit ? '药品关联维护--修改关联' : '药品关联维护--添加关联'"
+      class="topBack"
+      :param="$route.params"
+      linkTo="DrugManage"
+    ></crumbs>
     <div class="AddChemicalAndCommonMappingBox clearfix">
       <div class="titleBox clearfix">
         <p class="title">医院术语</p>
@@ -48,7 +53,7 @@
     </div>
     <div class="btn">
       <!-- <span class="sumbit" @click="submitForm">建立关联</span> -->
-      <el-button type="primary" :disabled="saveDisable" @click="submitForm">建立关联</el-button>
+      <el-button type="primary" :disabled="saveDisable" @click="submitForm">确定</el-button>
     </div>
   </div>
 </template>
@@ -138,7 +143,7 @@ export default {
     // 标准术语搜索列表
     getAllLisConcept() {
       let params = {
-        type: 5,  //药品
+        type: 5, //药品
         inputStr: this.uniqueText,
         sex: 3,
         age: 0
@@ -223,7 +228,7 @@ export default {
             if (this.isEdit) {
               params = { ...params, id: this.editId };
             }
-            this.saveLisMapping(params, '关联建立成功', 'success');
+            this.saveLisMapping(params,  this.isEdit ? '编辑成功' : '添加成功', 'success');
           } else {
             // 已存在,提示修改
             // this.showConfirmDialog('该关联已存在是否替换旧的关系信息', () => {
@@ -245,6 +250,12 @@ export default {
           this.warning(res.data.msg || msg, type);
           // this.$router.push({name: 'ChemicalAndCommonMapping'});
           this.initForm();
+          this.$router.push({
+            name: 'DrugManage',
+            params: Object.assign({}, this.$route.params, {
+              currentPage: 1
+            })
+          });
         } else {
           this.warning(res.data.msg);
         }

+ 8 - 2
src/components/icss/fusion/AddFusion.vue

@@ -48,7 +48,7 @@
     </div>
     <div class="btn">
       <!-- <span class="sumbit" @click="submitForm">建立关联</span> -->
-      <el-button type="primary" :disabled="saveDisable" @click="submitForm">建立关联</el-button>
+      <el-button type="primary" :disabled="saveDisable" @click="submitForm">确定</el-button>
     </div>
   </div>
 </template>
@@ -198,7 +198,7 @@ export default {
             if (this.isEdit) {
               params = { ...params, id: this.editId };
             }
-            this.saveLisMapping(params, '关联建立成功', 'success');
+            this.saveLisMapping(params,  this.isEdit ? '编辑成功' : '添加成功', 'success');
           } else {
             // 已存在,提示修改
             // this.showConfirmDialog('该关联已存在是否替换旧的关系信息', () => {
@@ -220,6 +220,12 @@ export default {
           this.warning(res.data.msg || msg, type);
           // this.$router.push({name: 'ChemicalAndCommonMapping'});
           this.initForm();
+          this.$router.push({
+            name: 'Fusion',
+            params: Object.assign({}, this.$route.params, {
+              currentPage: 1
+            })
+          });
         } else {
           this.warning(res.data.msg);
         }

+ 8 - 2
src/components/icss/lis/AddLis.vue

@@ -57,7 +57,7 @@
     </div>
     <div class="btn">
       <!-- <span class="sumbit" @click="submitForm">建立关联</span> -->
-      <el-button type="primary" :disabled="saveDisable" @click="submitForm">建立关联</el-button>
+      <el-button type="primary" :disabled="saveDisable" @click="submitForm">确定</el-button>
     </div>
   </div>
 </template>
@@ -223,7 +223,7 @@ export default {
             if (this.isEdit) {
               params = { ...params, id: this.editId };
             }
-            this.saveLisMapping(params, '关联建立成功', 'success');
+            this.saveLisMapping(params,  this.isEdit ? '编辑成功' : '添加成功', 'success');
           } else {
             // 已存在,提示修改
             // this.showConfirmDialog('该关联已存在是否替换旧的关系信息', () => {
@@ -245,6 +245,12 @@ export default {
           this.warning(res.data.msg || msg, type);
           // this.$router.push({name: 'ChemicalAndCommonMapping'});
           this.initForm();
+           this.$router.push({
+            name: 'Lis',
+            params: Object.assign({}, this.$route.params, {
+              currentPage: 1
+            })
+          });
         } else {
           this.warning(res.data.msg);
         }

+ 8 - 2
src/components/icss/operation/AddOperation.vue

@@ -48,7 +48,7 @@
     </div>
     <div class="btn">
       <!-- <span class="sumbit" @click="submitForm">建立关联</span> -->
-      <el-button type="primary" :disabled="saveDisable" @click="submitForm">建立关联</el-button>
+      <el-button type="primary" :disabled="saveDisable" @click="submitForm">确定</el-button>
     </div>
   </div>
 </template>
@@ -223,7 +223,7 @@ export default {
             if (this.isEdit) {
               params = { ...params, id: this.editId };
             }
-            this.saveLisMapping(params, '关联建立成功', 'success');
+            this.saveLisMapping(params,  this.isEdit ? '编辑成功' : '添加成功', 'success');
           } else {
             // 已存在,提示修改
             // this.showConfirmDialog('该关联已存在是否替换旧的关系信息', () => {
@@ -245,6 +245,12 @@ export default {
           this.warning(res.data.msg || msg, type);
           // this.$router.push({name: 'ChemicalAndCommonMapping'});
           this.initForm();
+          this.$router.push({
+            name: 'Operation',
+            params: Object.assign({}, this.$route.params, {
+              currentPage: 1
+            })
+          });
         } else {
           this.warning(res.data.msg);
         }

+ 8 - 2
src/components/icss/pacs/AddPacs.vue

@@ -48,7 +48,7 @@
     </div>
     <div class="btn">
       <!-- <span class="sumbit" @click="submitForm">建立关联</span> -->
-      <el-button type="primary" :disabled="saveDisable" @click="submitForm">建立关联</el-button>
+      <el-button type="primary" :disabled="saveDisable" @click="submitForm">确定</el-button>
     </div>
   </div>
 </template>
@@ -223,7 +223,7 @@ export default {
             if (this.isEdit) {
               params = { ...params, id: this.editId };
             }
-            this.saveLisMapping(params, '关联建立成功', 'success');
+            this.saveLisMapping(params,  this.isEdit ? '编辑成功' : '添加成功', 'success');
           } else {
             // 已存在,提示修改
             // this.showConfirmDialog('该关联已存在是否替换旧的关系信息', () => {
@@ -244,6 +244,12 @@ export default {
         if (res.data.code === '0') {
           this.warning(res.data.msg || msg, type);
           // this.$router.push({name: 'ChemicalAndCommonMapping'});
+           this.$router.push({
+            name: 'Pacs',
+            params: Object.assign({}, this.$route.params, {
+              currentPage: 1
+            })
+          });
           this.initForm();
         } else {
           this.warning(res.data.msg);

+ 20 - 9
src/components/icss/plan/AddPlan.vue

@@ -80,7 +80,12 @@
                           </div>
                           <div class="showNum" v-if="item.number">
                             <span style="marginRight:8px;">默认显示个数</span>
-                            <el-select v-model="item.number" placeholder="请选择" size="small"  :disabled="item.status !== 1 ? true: false">
+                            <el-select
+                              v-model="item.number"
+                              placeholder="请选择"
+                              size="small"
+                              :disabled="item.status !== 1 ? true: false"
+                            >
                               <el-option label="1" value="1"></el-option>
                               <el-option label="2" value="2"></el-option>
                               <el-option label="3" value="3"></el-option>
@@ -115,7 +120,7 @@
               </ul>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" @click="onSubmit" :disabled="saveDisable">确定添加</el-button>
+              <el-button type="primary" @click="onSubmit" :disabled="saveDisable">确定</el-button>
             </el-form-item>
           </el-form>
         </el-col>
@@ -319,15 +324,15 @@ export default {
       arrTemp1 = arr
         .filter(x => arrTemp.indexOf(x) == -1)
         .concat(arrTemp.filter(x => arr.indexOf(x) == -1));
-      let endArr = [...newPlan]
+      let endArr = [...newPlan];
       for (var j = 0; j < arrTemp1.length; j++) {
-        let temp = tempArr[arrTemp1[j]]
-        temp.orderNo = arr.length + j + 1
-        temp.status = 0
-        endArr.push(temp)
+        let temp = tempArr[arrTemp1[j]];
+        temp.orderNo = arr.length + j + 1;
+        temp.status = 0;
+        endArr.push(temp);
       }
       // console.log(endArr,'-=-=-=-=-=');
-      this.planDefaultList = endArr
+      this.planDefaultList = endArr;
     },
 
     // format处理细项数据
@@ -394,10 +399,16 @@ export default {
             if (res.data.code === '0') {
               this.$message({
                 showClose: true,
-                message: '操作成功',
+                message:  this.isEdit ? '编辑成功' : '添加成功',
                 type: 'success',
                 duration: 1000
               });
+              this.$router.push({
+                name: 'Plan',
+                params: Object.assign({}, this.$route.params, {
+                  currentPage: 1
+                })
+              });
             } else if (res.data.code === '00020007') {
               // 方案名/方案编码已存在
               this.$message({