XMLWAN 3 år sedan
förälder
incheckning
2f84b1826f

+ 15 - 0
src/store/modules/globalConfig.js Visa fil

509
         sodium: 1,
509
         sodium: 1,
510
         calcium: 1,
510
         calcium: 1,
511
         bicarbonate: 1
511
         bicarbonate: 1
512
+      },
513
+      21: {
514
+        id: 21,
515
+        name: 'HD+',
516
+        dialysis_duration: 1,
517
+        replacement_way: 1,
518
+        hemodialysis_machine: 2,
519
+        blood_filter: 1,
520
+        perfusion_apparatus: 2,
521
+        blood_flow_volume: 1,
522
+        dialysate_flow: 1,
523
+        kalium: 1,
524
+        sodium: 1,
525
+        calcium: 1,
526
+        bicarbonate: 1
512
       }
527
       }
513
     },
528
     },
514
     anticoagulants_confit: { // 抗凝剂
529
     anticoagulants_confit: { // 抗凝剂

+ 2 - 2
src/xt_pages/data/components/consumables.vue Visa fil

115
           {{ getGoodKind(scope.row.good_kind) }}
115
           {{ getGoodKind(scope.row.good_kind) }}
116
         </template>
116
         </template>
117
       </el-table-column>
117
       </el-table-column>
118
-      <el-table-column label="耗材编" width="140" align="center">
118
+      <el-table-column label="耗材编" width="140" align="center">
119
         <template slot-scope="scope">
119
         <template slot-scope="scope">
120
-          {{ scope.row.good_code }}
120
+          {{ scope.row.good_number }}
121
         </template>
121
         </template>
122
       </el-table-column>
122
       </el-table-column>
123
 
123
 

+ 1 - 1
src/xt_pages/dialysis/details/DialysisPrescription.vue Visa fil

10
           <span class="content">{{ dialysis_mode }}</span>
10
           <span class="content">{{ dialysis_mode }}</span>
11
         </li>
11
         </li>
12
 
12
 
13
-        <li v-if="isShow('置换量')">
13
+        <li v-if="isShow('置换量') && (dialysis_mode == 'HDF' || dialysis_mode == 'HF' || dialysis_mode =='HDF+HP')">
14
           <label>置换量 : </label>
14
           <label>置换量 : </label>
15
           <span class="content">{{
15
           <span class="content">{{
16
             replacement_total != "0" ? replacement_total : ""
16
             replacement_total != "0" ? replacement_total : ""

+ 5 - 0
src/xt_pages/dialysis/details/dialog/computer_dialog.vue Visa fil

211
       changeSchedualType: function(schedual_type) {
211
       changeSchedualType: function(schedual_type) {
212
         let ParamsQuery = {}
212
         let ParamsQuery = {}
213
         ParamsQuery['schedual_type'] = schedual_type
213
         ParamsQuery['schedual_type'] = schedual_type
214
+        ParamsQuery['record_date'] = this.$route.query.date
214
         GetSchedualNumber(ParamsQuery).then(response => {
215
         GetSchedualNumber(ParamsQuery).then(response => {
215
           if (response.data.state == 0) {
216
           if (response.data.state == 0) {
216
             return false
217
             return false
230
       GetSchedualNumber: function() {
231
       GetSchedualNumber: function() {
231
         let ParamsQuery = {}
232
         let ParamsQuery = {}
232
         ParamsQuery['schedual_type'] = this.schedual_type
233
         ParamsQuery['schedual_type'] = this.schedual_type
234
+        ParamsQuery['record_date'] = this.$route.query.date
235
+        console.log("列表33333333333333333333",ParamsQuery)
236
+        // console.log("路由",this.$route.query.date)
237
+       
233
         GetSchedualNumber(ParamsQuery).then(response => {
238
         GetSchedualNumber(ParamsQuery).then(response => {
234
           if (response.data.state == 0) {
239
           if (response.data.state == 0) {
235
             this.$message.error(response.data.msg)
240
             this.$message.error(response.data.msg)

+ 4 - 4
src/xt_pages/dialysis/template/DialysisPrintOrderThirtySeven.vue Visa fil

187
                     <span style="display:inline-block;width:30%">
187
                     <span style="display:inline-block;width:30%">
188
                         医生签名:
188
                         医生签名:
189
                         <span>
189
                         <span>
190
-                            <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
191
-                            <img style="height:30px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
190
+                            <span v-if="setAdminUserES(tableAdvice[0].advice_doctor) == ''">{{ getAdminUser(tableAdvice[0].advice_doctor) }}</span>
191
+                            <img class="es-img" style="height:30px;" :src="setAdminUserES(tableAdvice[0].advice_doctor)" alt="" srcset="" v-else />
192
                         </span>
192
                         </span>
193
                     </span>
193
                     </span>
194
                 </span>
194
                 </span>
415
             <div style="text-align:right;">
415
             <div style="text-align:right;">
416
                 医生签名:
416
                 医生签名:
417
                 <span style="display:inline-block;width:100px;text-align:left;">
417
                 <span style="display:inline-block;width:100px;text-align:left;">
418
-                    <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
419
-                    <img style="height:30px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
418
+                    <span v-if="setAdminUserES(tableAdvice[0].advice_doctor) == ''">{{ getAdminUser(tableAdvice[0].advice_doctor) }}</span>
419
+                    <img class="es-img" style="height:30px;" :src="setAdminUserES(tableAdvice[0].advice_doctor)" alt="" srcset="" v-else />
420
                 </span>
420
                 </span>
421
                 护士签名:
421
                 护士签名:
422
                 <span style="display:inline-block;width:100px;text-align:left;">
422
                 <span style="display:inline-block;width:100px;text-align:left;">

+ 1 - 1
src/xt_pages/stock/config/goodInfo.vue Visa fil

541
           //修改
541
           //修改
542
           val['id'] = this.goodInfo.editGoodId
542
           val['id'] = this.goodInfo.editGoodId
543
           val['good_code'] = this.goodInfo.good_code
543
           val['good_code'] = this.goodInfo.good_code
544
-
544
+          console.log("val2222",val)
545
           modifyGoodInfo(val).then(response => {
545
           modifyGoodInfo(val).then(response => {
546
             if (response.data.state == 0) {
546
             if (response.data.state == 0) {
547
               this.$message.error(response.data.msg)
547
               this.$message.error(response.data.msg)

+ 77 - 33
src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue Visa fil

8
     <div class="app-container ">
8
     <div class="app-container ">
9
       <div id="dialysis-print-box">
9
       <div id="dialysis-print-box">
10
         <div class="dialysis-print-order">
10
         <div class="dialysis-print-order">
11
-          <div class="order-title">药品入库登记表</div>
11
+          <div style="font-size:22px;font-weight:bold;text-align:center;">{{ orgName }}</div>
12
+          <div class="order-title" style="font-size:18px;padding-top:0;">药品入库登记表</div>
12
          
13
          
13
           <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
14
           <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
14
 
15
 
16
             <tbody>
17
             <tbody>
17
             <tr>
18
             <tr>
18
               <td width="80">药品名称</td>
19
               <td width="80">药品名称</td>
19
-              <td width="80">注册证号/批准文号/备案凭证号</td>
20
-              <td width="80">规格型号</td>
21
-              <td width="80">生产厂商</td>
22
-              <td width="80">单位</td>
23
-              <td width="80">进货价</td>
24
-              <td width="80">入库数量</td> 
25
-              <td width="80">总价</td>
26
-              <td width="80">批号</td>
27
-              <td width="80">生产日期</td>
28
-              <td width="80">有效日期</td>
29
-              <td width="80">质检意见</td>
30
-              <td width="80">验收结论</td>
20
+              <td style="line-height:18px;" width="80">注册证号/批准文号/备案凭证号</td>
21
+              <td style="line-height:18px;" width="80">规格<br>型号</td>
22
+              <td style="line-height:18px;" width="80">生产<br>厂商</td>
23
+              <td style="line-height:18px;" width="80">单位</td>
24
+              <td style="line-height:18px;" width="80">进货价</td>
25
+              <td style="line-height:18px;" width="80">入库<br>数量</td> 
26
+              <td style="line-height:18px;" width="60">总价</td>
27
+              <td style="line-height:18px;" width="80">批号</td>
28
+              <td style="line-height:18px;" width="120">生产日期</td>
29
+              <td style="line-height:18px;" width="120">有效日期</td>
30
+              <td style="line-height:18px;" width="60">质检<br>意见</td>
31
+              <td style="line-height:18px;" width="60">验收<br>结论</td>
31
             </tr>
32
             </tr>
32
 
33
 
33
             <tr v-for="(item,index) in WarehouseInfo.warehouseInfoDate" :key="item.id">
34
             <tr v-for="(item,index) in WarehouseInfo.warehouseInfoDate" :key="item.id">
34
-              <td style="line-height: 50px">
35
+              <td style="line-height: 18px">
35
                  <span v-if="item.drug_id != 0">{{item.drug.drug_name}}</span>
36
                  <span v-if="item.drug_id != 0">{{item.drug.drug_name}}</span>
36
               </td>
37
               </td>
37
-              <td>{{ item.remark }}</td>
38
-              <td style="line-height: 50px">
38
+              <td style="line-height: 18px">{{ item.remark }}</td>
39
+              <td style="line-height: 18px">
39
                  <span v-if="item.drug_id != 0">{{item.drug?item.drug.drug_spec:''}}</span>
40
                  <span v-if="item.drug_id != 0">{{item.drug?item.drug.drug_spec:''}}</span>
40
               </td>
41
               </td>
41
-              <td>{{ getManufacturer(item.manufacturer) }}</td>
42
-              <td style="line-height: 50px">
42
+              <td style="line-height: 18px">{{ getManufacturer(item.manufacturer) }}</td>
43
+              <td style="line-height: 18px">
43
                 <span>{{getUnit(item.drug_id)}}</span>
44
                 <span>{{getUnit(item.drug_id)}}</span>
44
               </td>
45
               </td>
45
-              <td style="line-height:50px">
46
+              <td style="line-height:18px">
46
                   {{item.price}}
47
                   {{item.price}}
47
               </td>
48
               </td>
48
-              <td style="line-height: 50px">
49
+              <td style="line-height: 18px">
49
                    <span>{{ item.warehousing_count }}</span>
50
                    <span>{{ item.warehousing_count }}</span>
50
               </td>
51
               </td>
51
               
52
               
52
-              <td style="line-height:50px">
53
+              <td style="line-height:18px">
53
                   <span>{{(item.warehousing_count * item.price).toFixed(2)}}</span>
54
                   <span>{{(item.warehousing_count * item.price).toFixed(2)}}</span>
54
               </td>
55
               </td>
55
-              <td>{{ item.number }}</td>
56
-              <td>{{ item.product_date | parseTime("{y}-{m}-{d}") }}</td>
57
-              <td>{{ item.expiry_date | parseTime("{y}-{m}-{d}") }}</td>
58
-              <td>正常入库</td>
59
-              <td>合格</td>
56
+              <td style="line-height:18px">{{ item.number }}</td>
57
+              <td style="line-height:18px">{{ item.product_date | parseTime("{y}-{m}-{d}") }}</td>
58
+              <td style="line-height:18px">{{ item.expiry_date | parseTime("{y}-{m}-{d}") }}</td>
59
+              <td style="line-height:18px">正常<br>入库</td>
60
+              <td style="line-height:18px">合格</td>
60
             </tr>
61
             </tr>
61
             <tr>
62
             <tr>
62
               <td>合计</td>
63
               <td>合计</td>
63
-              <td colspan="11"></td>
64
-              <td>{{allPrice.toFixed(2)}}</td>
64
+              <td colspan="12" style="text-align:right;">{{allPrice.toFixed(2)}}</td>
65
             </tr>
65
             </tr>
66
             </tbody>
66
             </tbody>
67
           </table>
67
           </table>
70
           <div style="display:flex;margin-top:20px;float:right;">
70
           <div style="display:flex;margin-top:20px;float:right;">
71
             <div style="width:50px;">审批:</div><div style="width:100px;"></div>
71
             <div style="width:50px;">审批:</div><div style="width:100px;"></div>
72
             <div style="width:80px;">药材主任:</div><div style="width:100px;"></div>
72
             <div style="width:80px;">药材主任:</div><div style="width:100px;"></div>
73
-            <div style="width:50px;">会计:</div><div style="width:100px;"></div>
74
-            <div style="width:50px;">审核:</div><div style="width:100px;"></div>
75
-            <div style="width:70px;">制单人:</div><div style="width:100px;"></div>
73
+            <div style="width:50px;">会计:</div><div style="width:100px;"><span v-if='orgId == 10024'>徐立琼</span></div>
74
+            <div style="width:50px;">审核:</div><div style="width:100px;"><span v-if='orgId == 10024'>徐立琼</span></div>
75
+            <div style="width:70px;">制单人:</div><div style="width:100px;">{{ getXuserName(this.WarehouseInfo.warehouse.creater) }}</div>
76
           </div>
76
           </div>
77
         </div>
77
         </div>
78
 
78
 
91
   import print from 'print-js'
91
   import print from 'print-js'
92
   import {getDrugWarehouseInfoList} from "@/api/drug/drug_stock";
92
   import {getDrugWarehouseInfoList} from "@/api/drug/drug_stock";
93
   import {getBaseDrugLibList} from '@/api/data'
93
   import {getBaseDrugLibList} from '@/api/data'
94
+  import { fetchAllAdminUsers } from "@/api/doctor";
94
   export default {
95
   export default {
95
     name: 'dialysisPrintOrder',
96
     name: 'dialysisPrintOrder',
96
     components: {
97
     components: {
130
         is_inject:"",
131
         is_inject:"",
131
         page:1,
132
         page:1,
132
         limit:10000,
133
         limit:10000,
133
-        keywords:""
134
+        keywords:"",
135
+        orgName:'',
136
+        orgId:'',
137
+        adminUserOptions:[]
134
       }
138
       }
135
     },
139
     },
136
     methods: {
140
     methods: {
154
       printThisPage() {
158
       printThisPage() {
155
         var ptime = Math.round(new Date().getTime() / 1000)
159
         var ptime = Math.round(new Date().getTime() / 1000)
156
         this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
160
         this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
157
-        const style = '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}'
161
+        const style = '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px} .dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 1px 5px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}'
158
         printJS({
162
         printJS({
159
           printable: 'dialysis-print-box',
163
           printable: 'dialysis-print-box',
160
           type: 'html',
164
           type: 'html',
246
             }
250
             }
247
         });
251
         });
248
       },
252
       },
253
+      fetchAllAdminUsers() {
254
+        fetchAllAdminUsers().then(response => {
255
+          console.log(response);
256
+          if (response.data.state == 1) {
257
+            this.adminUserOptions = response.data.data.users;
258
+            var alen = this.adminUserOptions.length;
259
+            for (let index = 0; index < alen; index++) {
260
+              if (this.adminUserOptions[index].user_type == 2) {
261
+                // this.doctorOptions.push(this.adminUserOptions[index]);
262
+              }
263
+            }
264
+          }
265
+        });
266
+      },
267
+      getXuserName(id) {
268
+        if (id <= 0) {
269
+          return "";
270
+        }
271
+        var name = "";
272
+        if (
273
+          this.adminUserOptions == null ||
274
+          typeof this.adminUserOptions.length === "undefined"
275
+        ) {
276
+          return name;
277
+        }
278
+        var leng = this.adminUserOptions.length;
279
+        if (leng == 0) {
280
+          return name;
281
+        }
282
+        for (let index = 0; index < leng; index++) {
283
+          if (this.adminUserOptions[index].id == id) {
284
+            name = this.adminUserOptions[index].name;
285
+            break;
286
+          }
287
+        }
288
+        return name;
289
+      },
249
     },
290
     },
250
     created() {
291
     created() {
292
+      this.orgName = this.$store.getters.xt_user.org.org_name;
293
+      this.orgId = this.$store.getters.xt_user.org.id;
294
+      this.fetchAllAdminUsers()
251
       this.GetConfigInfo()
295
       this.GetConfigInfo()
252
       const order_id = this.$route.query.id;
296
       const order_id = this.$route.query.id;
253
       this.GetOrderDetail(order_id);
297
       this.GetOrderDetail(order_id);

+ 108 - 44
src/xt_pages/stock/stockInOrderDetailPrint.vue Visa fil

12
             <div id="print_content">
12
             <div id="print_content">
13
                 <div class="print_main_content">
13
                 <div class="print_main_content">
14
                     <div class="order_title_panl">
14
                     <div class="order_title_panl">
15
-                        <span class="main_title">耗材入库登记单</span>
15
+                        <div style="font-size:22px;font-weight:bold;">{{ orgName }}</div>
16
+                        <span style="font-weight:500;font-size:18px;">耗材入库登记单</span>
16
                     </div>
17
                     </div>
17
                     <div style="text-align:right;margin-bottom:20px;font-size: 18px;">
18
                     <div style="text-align:right;margin-bottom:20px;font-size: 18px;">
18
                       打印时间:{{time_now}}
19
                       打印时间:{{time_now}}
21
                         <table class="table">
22
                         <table class="table">
22
                             <thead>
23
                             <thead>
23
                                 <tr>
24
                                 <tr>
24
-                                    <td width="80">耗材名称</td>
25
-                                    <td width="80">注册证号/批准文号/备案凭证号</td>
26
-                                    <td width="80">规格型号</td>
27
-                                    <td width="80">生产厂商</td>
28
-                                    <td width="80">单位</td>
29
-                                    <td width="80">进货价</td>
30
-                                    <td width="80">入库数量</td> 
31
-                                    <td width="80">总价</td>
32
-                                    <td width="80">批号</td>
33
-                                    <td width="80">生产日期</td>
34
-                                    <td width="80">有效日期</td>
35
-                                    <td width="80">质检意见</td>
36
-                                    <td width="80">验收结论</td>
25
+                                    <td style="line-height:18px;" width="80">耗材<br>名称</td>
26
+                                    <td style="line-height:18px;" width="80">注册证号/批准文号/备案凭证号</td>
27
+                                    <td style="line-height:18px;" width="80">规格<br>型号</td>
28
+                                    <td style="line-height:18px;" width="80">生产<br>厂商</td>
29
+                                    <td style="line-height:18px;" width="80">单位</td>
30
+                                    <td style="line-height:18px;" width="80">进货价</td>
31
+                                    <td style="line-height:18px;" width="80">入库<br>数量</td> 
32
+                                    <td style="line-height:18px;" width="60">总价</td>
33
+                                    <td style="line-height:18px;" width="80">批号</td>
34
+                                    <td style="line-height:18px;" width="120">生产日期</td>
35
+                                    <td style="line-height:18px;" width="120">有效日期</td>
36
+                                    <td style="line-height:18px;" width="60">质检<br>意见</td>
37
+                                    <td style="line-height:18px;" width="60">验收<br>结论</td>
37
                                 </tr>
38
                                 </tr>
38
                             </thead>
39
                             </thead>
39
                             <tbody>
40
                             <tbody>
40
                                 <tr v-for='(item,index) in WarehouseInfo.warehouseInfoDate' :key="index">
41
                                 <tr v-for='(item,index) in WarehouseInfo.warehouseInfoDate' :key="index">
41
-                                    <td><span v-if="item.good_id != 0">{{getTypeNameOne(item.good_id)}}</span></td>
42
-                                    <td>{{ item.remark }}</td>
43
-                                    <td><span v-if="item.good_id != 0">{{getSpecificationName(item.good_id)}}</span></td>
44
-                                    <td>{{ getManufacturer(item.manufacturer) }}</td>
45
-                                    <td><span v-if="item.good_id!=0">{{getUnit(item.good_id)}}</span></td>
46
-                                    <td>{{item.price}}</td>
47
-                                    <td>{{item.warehousing_count}}</td> 
48
-                                    <td>{{(item.warehousing_count*item.price).toFixed(2)}}</td>
49
-                                    <td>{{ item.number }}</td>
50
-                                    <td>{{ item.product_date | parseTime("{y}-{m}-{d}") }}</td>
51
-                                    <td>{{ item.expiry_date | parseTime("{y}-{m}-{d}") }}</td>
52
-                                    <td>正常入库</td>
53
-                                    <td>合格</td>
42
+                                    <td style="line-height:18px;"><span v-if="item.good_id != 0">{{getTypeNameOne(item.good_id)}}</span></td>
43
+                                    <td style="line-height:18px;">{{ item.remark }}</td>
44
+                                    <td style="line-height:18px;"><span v-if="item.good_id != 0">{{getSpecificationName(item.good_id)}}</span></td>
45
+                                    <td style="line-height:18px;">{{ getManufacturer(item.good_id) }}</td>
46
+                                    <td style="line-height:18px;"><span v-if="item.good_id!=0">{{getUnit(item.good_id)}}</span></td>
47
+                                    <td style="line-height:18px;">{{item.price}}</td>
48
+                                    <td style="line-height:18px;">{{item.warehousing_count}}</td> 
49
+                                    <td style="line-height:18px;">{{(item.warehousing_count*item.price).toFixed(2)}}</td>
50
+                                    <td style="line-height:18px;">{{ item.number }}</td>
51
+                                    <td style="line-height:18px;">{{ item.product_date | parseTime("{y}-{m}-{d}") }}</td>
52
+                                    <td style="line-height:18px;">{{ item.expiry_date | parseTime("{y}-{m}-{d}") }}</td>
53
+                                    <td style="line-height:18px;">正常<br>入库</td>
54
+                                    <td style="line-height:18px;">合格</td>
54
                                 </tr>
55
                                 </tr>
55
                                 <tr>
56
                                 <tr>
56
                                   <td>合计</td>
57
                                   <td>合计</td>
57
-                                  <td colspan="11"></td>
58
-                                  <td>{{allPrice.toFixed(2)}}</td>
58
+                                  <td colspan="12" style="text-align:right;">{{allPrice.toFixed(2)}}</td>
59
                                </tr>
59
                                </tr>
60
                             </tbody>
60
                             </tbody>
61
                         </table>
61
                         </table>
63
                         <div style="display:flex;margin-top:20px;float:right;">
63
                         <div style="display:flex;margin-top:20px;float:right;">
64
                             <div style="width:50px;">审批:</div><div style="width:100px;"></div>
64
                             <div style="width:50px;">审批:</div><div style="width:100px;"></div>
65
                             <div style="width:80px;">药材主任:</div><div style="width:100px;"></div>
65
                             <div style="width:80px;">药材主任:</div><div style="width:100px;"></div>
66
-                            <div style="width:50px;">会计:</div><div style="width:100px;"></div>
67
-                            <div style="width:50px;">审核:</div><div style="width:100px;"></div>
68
-                            <div style="width:70px;">制单人:</div><div style="width:100px;"></div>
66
+                            <div style="width:50px;">会计:</div><div style="width:100px;"><span v-if='orgId == 10024'>徐立琼</span></div>
67
+                            <div style="width:50px;">审核:</div><div style="width:100px;"><span v-if='orgId == 10024'>徐立琼</span></div>
68
+                            <div style="width:70px;">制单人:</div><div style="width:100px;">{{ getXuserName(this.WarehouseInfo.warehouse.creater) }}</div>
69
                        </div>
69
                        </div>
70
                     </div>
70
                     </div>
71
                 </div>
71
                 </div>
81
   getWarehouseInfoList,
81
   getWarehouseInfoList,
82
   getGoodInfoList
82
   getGoodInfoList
83
 } from "@/api/stock";
83
 } from "@/api/stock";
84
+import { fetchAllAdminUsers } from "@/api/doctor";
84
 import print from 'print-js'
85
 import print from 'print-js'
85
 const moment = require('moment')
86
 const moment = require('moment')
86
 export default {
87
 export default {
120
             is_use:"",
121
             is_use:"",
121
             good_kind:"",
122
             good_kind:"",
122
             is_charge:"",
123
             is_charge:"",
123
-            list:[]
124
+            list:[],
125
+            orgName:'',
126
+            orgId:'',
127
+            adminUserOptions:[]
124
         }
128
         }
125
     },
129
     },
126
     methods:{
130
     methods:{
127
       printAction: function() {
131
       printAction: function() {
128
-          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
132
+          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 1px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
129
           printJS({
133
           printJS({
130
           printable: 'print_content',
134
           printable: 'print_content',
131
           type: 'html',
135
           type: 'html',
145
             this.dealer = response.data.data.dealer;
149
             this.dealer = response.data.data.dealer;
146
             this.goodInfo = response.data.data.goodInfo;
150
             this.goodInfo = response.data.data.goodInfo;
147
             this.goodType = response.data.data.goodType;
151
             this.goodType = response.data.data.goodType;
152
+           
153
+           for(let i=0;i<this.goodInfo.length;i++){
154
+               this.goodInfo[i].manufacturer_name = ""
155
+            }
156
+            for(let i=0;i<this.goodInfo.length;i++){
157
+               for(let j=0;j<this.manufacturer.length;j++){
158
+                  if(this.goodInfo[i].manufacturer == this.manufacturer[j].id){
159
+                     this.goodInfo[i].manufacturer_name = this.manufacturer[j].manufacturer_name
160
+                  }
161
+               } 
162
+            }
163
+             console.log("商品信息",this.goodInfo)
148
             }
164
             }
149
         });
165
         });
150
         },
166
         },
243
         }
259
         }
244
         return ""
260
         return ""
245
       },
261
       },
246
-      getManufacturer(id){
247
-        let name = ''
248
-        this.manufacturer.map(item => {
249
-          if(item.id == id){
250
-            name = item.manufacturer_name
262
+      // getManufacturer(id){
263
+      //   let name = ''
264
+      //   this.manufacturer.map(item => {
265
+      //     if(item.id == id){
266
+      //       name = item.manufacturer_name
267
+      //     }
268
+      //   })
269
+      //   return name
270
+      // },
271
+     getManufacturer(id){
272
+         let name = ""
273
+         for(let i=0;i<this.goodInfo.length;i++){
274
+             if(id == this.goodInfo[i].id){
275
+                name  =this.goodInfo[i].manufacturer_name
276
+             }
277
+         }
278
+         return name
279
+      },
280
+      fetchAllAdminUsers() {
281
+        fetchAllAdminUsers().then(response => {
282
+          console.log(response);
283
+          if (response.data.state == 1) {
284
+            this.adminUserOptions = response.data.data.users;
285
+            var alen = this.adminUserOptions.length;
286
+            for (let index = 0; index < alen; index++) {
287
+              if (this.adminUserOptions[index].user_type == 2) {
288
+                // this.doctorOptions.push(this.adminUserOptions[index]);
289
+              }
290
+            }
251
           }
291
           }
252
-        })
253
-        return name
254
-      }
292
+        });
293
+      },
294
+      getXuserName(id) {
295
+        if (id <= 0) {
296
+          return "";
297
+        }
298
+        var name = "";
299
+        if (
300
+          this.adminUserOptions == null ||
301
+          typeof this.adminUserOptions.length === "undefined"
302
+        ) {
303
+          return name;
304
+        }
305
+        var leng = this.adminUserOptions.length;
306
+        if (leng == 0) {
307
+          return name;
308
+        }
309
+        for (let index = 0; index < leng; index++) {
310
+          if (this.adminUserOptions[index].id == id) {
311
+            name = this.adminUserOptions[index].name;
312
+            break;
313
+          }
314
+        }
315
+        return name;
316
+      },
255
     },
317
     },
256
     created(){
318
     created(){
257
-
319
+      this.orgName = this.$store.getters.xt_user.org.org_name;
320
+      this.orgId = this.$store.getters.xt_user.org.id;
258
       const order_id = this.$route.query.id;
321
       const order_id = this.$route.query.id;
322
+      this.fetchAllAdminUsers()
259
       this.GetConfigInfo();
323
       this.GetConfigInfo();
260
       this.GetOrderDetail(order_id);
324
       this.GetOrderDetail(order_id);
261
       this.getList()
325
       this.getList()
294
             border: 1px solid;
358
             border: 1px solid;
295
             text-align: center;
359
             text-align: center;
296
             font-size: 18px;
360
             font-size: 18px;
297
-            padding: 15px 5px;
361
+            padding: 1px 5px;
298
           }
362
           }
299
         }
363
         }
300
       }
364
       }