See999 преди 4 години
родител
ревизия
80ce98e6ee

+ 2 - 2
src/router/modules/qcd.js Целия файл

@@ -7,7 +7,7 @@ export default {
7 7
   name: "qcd",
8 8
   alwaysShow: true,
9 9
   meta: {
10
-    title: "科室质控",
10
+    title: "质控管理",
11 11
     icon: "statistics"
12 12
   },
13 13
   children: [
@@ -244,7 +244,7 @@ export default {
244 244
       component: () => import("@/xt_pages/qcd/workAnalysis/doctor"),
245 245
       name: "workAnalysisDoctor",
246 246
       meta: {
247
-        title: "工作量分析统计医生",
247
+        title: "工作量分析统计",
248 248
         noCache: true
249 249
       }
250 250
     },

Файловите разлики са ограничени, защото са твърде много
+ 1486 - 0
src/xt_pages/dialysis/batch_print/batch_print_order_thirteen.vue


+ 36 - 26
src/xt_pages/qcd/treatmentControlAnalysis/components/CheckAll.vue Целия файл

@@ -66,7 +66,7 @@
66 66
           :key="index"
67 67
         >
68 68
           <template slot-scope="scope">
69
-              {{ scope.row.data[1].Count}}
69
+              {{ scope.row.data[index].Count}}
70 70
           </template>
71 71
         </el-table-column>
72 72
         </el-table>
@@ -109,6 +109,9 @@ export default {
109 109
     };
110 110
   },
111 111
   methods: {
112
+    handleDelete(index, row) {
113
+        console.log(index, row);
114
+      },
112 115
     changeTime(val) {
113 116
       var time = this.getTimestamp(val) - this.getTimestamp(this.listQuery.end_time);
114 117
       if (time > 0) {
@@ -167,13 +170,14 @@ export default {
167 170
         if(response.data.state === 1){
168 171
            var inspection = response.data.data.inspection
169 172
            console.log("inspection",inspection)
170
-           var a=[1];
173
+           var a=[];
171 174
            for(let i=0;i<inspection.length;i++){
172 175
              a.push(inspection[i])
173 176
            }
174 177
            console.log("a",a)
178
+           this.newArr = a
175 179
            var arr = this.arrayToObj(a)
176
-
180
+           
177 181
            console.log("arr",arr)
178 182
            this.ObjectData = arr
179 183
            this.tableName = inspection
@@ -239,44 +243,50 @@ export default {
239 243
 
240 244
 
241 245
           var list = response.data.data.list
242
-           console.log("list",list)
243
-            var dtd = []
244
-            for(let i=0;i<list.length;i++){
245
-                for(let j=0;j<this.tableName.length;j++){
246
-                    if(list[i].ProjectId == this.tableName[j].inspection_major){
247
-                      dtd.push(list[i])
248
-                    }
249
-                }
250
-            }
251
-           console.log("dtd",dtd)
246
+          console.log("list",list)
247
+          var dtd = []
248
+          for(let i=0;i<list.length;i++){
249
+              for(let j=0;j<this.tableName.length;j++){
250
+                  if(list[i].ProjectId == this.tableName[j].inspection_major){
251
+                    dtd.push(list[i])
252
+                  }
253
+              }
254
+          }
255
+          console.log("dtd",dtd)
252 256
           var dd = {};
253 257
            for (const index in dtd) {
254 258
             if (!(dtd[index].name in dd)) {
255 259
                dd[dtd[index].name] = {};
256 260
             }
257 261
             if (!(dtd[index].ProjectId in dd[dtd[index].name]) && dtd[index].ProjectId != 0) {
258
-              dd[dtd[index].name][dtd[index].ProjectId] = dtd[index];
262
+              dd[dtd[index].name][dtd[index].ProjectName] = dtd[index];
259 263
             }
260 264
           }
261
-
262
-           for(const key in dd){
265
+          console.log("ddd",dd)
266
+            for(const key in dd){
263 267
               for(const mkey in this.ObjectData){
264
-               if (mkey in dd[key]) {
265
-                    dd[key][mkey].ProjectName = this.ObjectData[mkey].project_name;
266
-                    var Count = parseInt(dd[key][mkey].Count);
267
-                    console.log("Count",Count)
268
-
269
-                }else{
270
-                   dd[key][mkey] = {
268
+                if (!(this.ObjectData[mkey].project_name in dd[key])) {
269
+                  dd[key][this.ObjectData[mkey].project_name] = {
271 270
                     ProjectName: this.ObjectData[mkey].project_name,
272 271
                     name: mkey,
273
-                   Count: 0
272
+                    Count: 0
274 273
                   };
275 274
                 }
276
-             }
277
-             this.tableData.push({ name: key, data: dd[key]});
275
+              }
276
+              this.tableData.push({ name: key, data: dd[key]});
278 277
             }
279 278
             console.log("表",this.tableData)
279
+            let projectArr = []
280
+            this.newArr.map(item => {
281
+              projectArr.push(item.project_name)
282
+            })
283
+            this.tableData.map(item => {
284
+              let arr = Object.values(item.data);
285
+              arr.sort((a,b)=>{
286
+                return projectArr.indexOf(a.ProjectName)-projectArr.indexOf(b.ProjectName);
287
+              });
288
+              item.data = arr
289
+            })
280 290
          }
281 291
       })
282 292
     },