zhengchengwu 6 years ago
parent
commit
d4f6e40cac

+ 1 - 1
config/dev.env.js View File

@@ -6,5 +6,5 @@
6 6
 module.exports = {
7 7
   NODE_ENV: '"development"',
8 8
   ENV_CONFIG: '"dev"',
9
-  BASE_API: '"http://112.74.16.180:9527"',//'"http://112.74.16.180:9527"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527
9
+  BASE_API: '"http://localhost:9529"',//'"http://localhost:9529"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527
10 10
 }

+ 6 - 6
src/router/index.js View File

@@ -774,12 +774,6 @@ export const xt_asyncRouterMap = [
774 774
   //   meta: { title: 'stockManage', icon: 'stock' },
775 775
   //   children: [
776 776
   //     {
777
-  //       path: '/stock/config',
778
-  //       component: () => import('@/xt_pages/stock/index'),
779
-  //       name: 'config',
780
-  //       meta: { title: 'config' }
781
-  //     },
782
-  //     {
783 777
   //       path: '/stock/in',
784 778
   //       component: () => import('@/xt_pages/stock/stockInOrder'),
785 779
   //       name: 'stockInOrder',
@@ -886,6 +880,12 @@ export const xt_asyncRouterMap = [
886 880
   //       hidden: true,
887 881
   //       is_menu: false,
888 882
   //       meta: { title: 'cancelStockDetail', noCache: true }
883
+  //     },
884
+  //     {
885
+  //       path: '/stock/config',
886
+  //       component: () => import('@/xt_pages/stock/index'),
887
+  //       name: 'config',
888
+  //       meta: { title: 'config' }
889 889
   //     }
890 890
   //   ]
891 891
   //  },

+ 1 - 1
src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue View File

@@ -21,7 +21,7 @@
21 21
 
22 22
 
23 23
         <el-button  v-if="groupSelectRow != null"   round @click="openDeleteGroupAdvice" :loading="deleLoading">删除医嘱</el-button>
24
-        <el-button v-else disabled round @click="openDeleteGroupAdvice" :loading="deleLoading">修改医嘱</el-button>
24
+        <el-button v-else disabled round @click="openDeleteGroupAdvice" :loading="deleLoading">删除医嘱</el-button>
25 25
 
26 26
         <!--<el-button round @click="openNewChild" :loading="deleLoading">新增子药</el-button>-->
27 27
       </div>

+ 28 - 1
src/xt_pages/qcd/outcomeIndicators/control.vue View File

@@ -120,7 +120,7 @@
120 120
           <template slot-scope="scope"><span>{{getTime(scope.row.inspect_date, '{y}{m}{d}')}}</span></template>
121 121
         </el-table-column>
122 122
         
123
-        <el-table-column :label="reference.item_name+'//'+reference.unit" min-width="210" align="center" v-for="(reference, index) in activeReferences" :key="index"  :render-header="renderheader">
123
+        <el-table-column :label="reference.item_name+'//'+reference.unit" :min-width="itemWight(reference, index)" align="center" v-for="(reference, index) in activeReferences" :key="index"  :render-header="renderheader">
124 124
           <template slot-scope="scope"><span>{{getItemVulue(reference.project_id, reference.id, scope.row)}}</span></template>
125 125
         </el-table-column>
126 126
       </el-table>
@@ -219,6 +219,33 @@ export default {
219 219
     this.getList();
220 220
   },
221 221
   methods: {
222
+    itemWight(reference, index) {
223
+      var width = 70;
224
+      switch (index) {
225
+        case 0:
226
+          width = 110
227
+          break;
228
+        case 1:
229
+        case 3:
230
+          width = 100
231
+          break;
232
+        case 2:
233
+          width = 160
234
+          break;
235
+      
236
+        default:
237
+          break;
238
+      }
239
+      return width;
240
+      // if(typeof(reference.item_name) !='undefined') {
241
+      //   console.log("reference.item_name.length * 20", reference.item_name.length * 20);
242
+      //   return reference.item_name.length * 20;
243
+
244
+      // } else {
245
+      //   return 80;
246
+      // }
247
+      
248
+    },
222 249
     getList() {
223 250
       GetOICData(this.listQuery).then(response => {
224 251
         if (response.data.state == 0) {

+ 2 - 2
src/xt_pages/user/doctorAdvice.vue View File

@@ -247,10 +247,10 @@
247 247
                             <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round  @click="openGroupAdvice(0)">新增医嘱内容</el-button>
248 248
                         </el-col>
249 249
                         <el-col :span="5">
250
-                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round @click="openDeleteGroupAdvice()">删除医嘱内容</el-button>
250
+                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round  @click="openGroupAdvice(1)">修改医嘱内容</el-button>
251 251
                         </el-col>
252 252
                         <el-col :span="5">
253
-                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round  @click="openGroupAdvice(1)">修改医嘱内容</el-button>
253
+                            <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round @click="openDeleteGroupAdvice()">删除医嘱内容</el-button>
254 254
                         </el-col>
255 255
                         
256 256
                     </el-row>