XMLWAN 2 years ago
parent
commit
2a111f433b

+ 10 - 12
src/xt_pages/data/components/addInspection.vue View File

@@ -155,7 +155,7 @@
155 155
             <template slot-scope="scope">
156 156
               <div v-if="scope.row.type == 2">{{ scope.row.unit }}</div>
157 157
               <div v-if="scope.row.type == 3">
158
-                {{ getUnit(scope.row.unit) }}
158
+               {{ scope.row.unit }}
159 159
               </div>
160 160
             </template>
161 161
           </el-table-column>
@@ -251,7 +251,6 @@ export default {
251 251
       }
252 252
     },
253 253
     changeProject(val) {
254
-      console.log("i23232323323",val.id)
255 254
       this.form.number = 1;
256 255
     },
257 256
     querySearch(queryString, cb) {
@@ -272,7 +271,7 @@ export default {
272 271
       };
273 272
     },
274 273
     handleSelect(val) {
275
-      console.log("val3223322323232323",val)
274
+     
276 275
       this.project_name = val.project_name;
277 276
       this.form.project_detail = val.id;
278 277
     },
@@ -314,7 +313,7 @@ export default {
314 313
         saveTeam(data, params).then((response) => {
315 314
           if (response.data.state == 1) {
316 315
             var projectTeam = response.data.data.projectTeam;
317
-            // console.log('projectTeam', projectTeam)
316
+           
318 317
             this.$message.success("保存成功");
319 318
             this.visible = false;
320 319
             (this.form.project_team = ""),
@@ -341,12 +340,12 @@ export default {
341 340
         if (response.data.state == 1) {
342 341
           var projectList = response.data.data.projectList;
343 342
           var goodInfos = response.data.data.good_info;
344
-
343
+    
345 344
           for (let i = 0; i < projectList.length; i++) {
346 345
             let obj = {
347 346
               id: projectList[i].id,
348 347
               statistical_classification:
349
-                projectList[i].statistical_classification,
348
+              projectList[i].statistical_classification,
350 349
               number: "1",
351 350
               project_name: projectList[i].project_name,
352 351
               unit: projectList[i].unit,
@@ -363,12 +362,10 @@ export default {
363 362
           for (let i = 0; i < goodInfos.length; i++) {
364 363
             let obj = {
365 364
               id: goodInfos[i].id,
366
-              statistical_classification:
367
-                goodInfos[i].statistical_classification,
365
+              statistical_classification:goodInfos[i].statistical_classification,
368 366
               number: "1",
369
-              project_name:
370
-                goodInfos[i].good_name + " " + goodInfos[i].specification_name,
371
-              unit: goodInfos[i].good_unit,
367
+              project_name:goodInfos[i].good_name + " " + goodInfos[i].specification_name,
368
+              unit: goodInfos[i].packing_unit,
372 369
               price: goodInfos[i].retail_price,
373 370
               type: 3,
374 371
               new_id: Math.floor(
@@ -379,7 +376,7 @@ export default {
379 376
             this.projectList.push(obj);
380 377
           }
381 378
 
382
-          console.log("项目2323332", this.projectList);
379
+         
383 380
         }
384 381
       });
385 382
     },
@@ -416,6 +413,7 @@ export default {
416 413
             }
417 414
           }
418 415
         }
416
+        console.log("project_232332323232323232",this.projectList)
419 417
         for (let i = 0; i < this.projectList.length; i++) {
420 418
           if (this.form.project_detail == this.projectList[i].new_id) {
421 419
             this.projectList[i].number = this.form.number

+ 3 - 3
src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue View File

@@ -7,7 +7,7 @@
7 7
     </div>
8 8
     <div class="app-container ">
9 9
       <div id="dialysis-print-box">
10
-        <div v-if="orgId!=9675 && orgId!=10210">
10
+        <div v-if="orgId!=9675 && orgId!=10210 && orgId!=10188 && orgId!=10127">
11 11
         <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
12 12
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
13 13
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
@@ -78,7 +78,7 @@
78 78
       </div> 
79 79
 
80 80
 
81
-      <div v-if="orgId == 9675 || orgId == 10210">
81
+      <div v-if="orgId == 9675 || orgId == 10210 || orgId == 10188 || orgId == 10127">
82 82
        <div class="dialysis-print-order" v-for="(it,index) in tableData" :key="index" >
83 83
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
84 84
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
@@ -125,7 +125,7 @@
125 125
              </td>
126 126
              <td>{{item.batch_number}}</td>
127 127
              <td>{{(getTime(item.product_date))}}</td>
128
-             <td>{{(getTime(item.expire_date))}}</td>
128
+             <td>{{(getTime(item.expiry_date))}}</td>
129 129
             </tr>
130 130
 
131 131
              <tr>

+ 4 - 2
src/xt_pages/user/dialysisSolution.vue View File

@@ -1586,7 +1586,9 @@ export default {
1586 1586
       this.addPlan.hemodialysis_machine = row.hemodialysis_machine + ''
1587 1587
       this.addPlan.perfusion_apparatus = row.perfusion_apparatus + ''
1588 1588
       this.addPlan.max_ultrafiltration_rate = row.max_ultrafiltration_rate
1589
-
1589
+      this.addPlan.anticoagulant_zongliang = row.anticoagulant_zongliang
1590
+      this.addPlan.anticoagulant_shouji = row.anticoagulant_shouji
1591
+      this.addPlan.anticoagulant_weichi = row.anticoagulant_weichi
1590 1592
       // this.addPlan.oxygen_uptake = row.oxygen_uptake
1591 1593
       // this.addPlan.hemodialysis_pipelines = row.hemodialysis_pipelines
1592 1594
       // this.addPlan.hemodialysis_pipelines_count = row.hemodialysis_pipelines_count
@@ -1751,7 +1753,7 @@ export default {
1751 1753
     },
1752 1754
     isShows(name) {
1753 1755
       var filedList = store.getters.xt_user.fileds
1754
-      console.log("filedList2323232",filedList)
1756
+      
1755 1757
       for (let i = 0; i < filedList.length; i++) {
1756 1758
         if (
1757 1759
           filedList[i].module == 1 &&