Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/api/supply.js

@@ -39,3 +39,19 @@ export function updatePurchaseOrder(data, supplier_name, start_time, end_time, r
     data: data
   })
 }
+
+export function checkPurchaseOrder(id, params) {
+  return request({
+    url: '/api/supply/checkpurchaseorder?id=' + id,
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getPurchaseOrderDetail(id, params) {
+  return request({
+    url: '/api/supply/getpurchaseorderdetail?id=' + id,
+    method: 'get',
+    params: params
+  })
+}

src/lang/zh.js

@@ -138,6 +138,7 @@ export default {
     stockQuery: '库存查询',
     supplyQuery: '供应商管理',
     purchaseOrderQuery: '购货订单',
+    goodOrderQuery: '购货单',
     addPurchaseOrder: '新增购货订单',
     workforce_template: '排班模板设置',
     statistics: '统计分析',

src/router/modules/supply.js

@@ -41,6 +41,41 @@ export default {
       hidden: true,
       is_menu: false,
       isChild: true
+    },
+    {
+      path: '/purchase/order/edit',
+      component: () => import('@/xt_pages/supply/components/editPurchaseOrder'),
+      name: 'editPurchaseOrder',
+      meta: { title: 'editPurchaseOrder', noCache: true },
+      hidden: true,
+      is_menu: false,
+      isChild: true
+    },
+    {
+      path: '/purchase/order/print',
+      component: () => import('@/xt_pages/supply/components/purchaseOrderPrint'),
+      name: 'purchaseOrderPrint',
+      meta: { title: 'purchaseOrderPrint', noCache: true },
+      hidden: true,
+      is_menu: false,
+      isChild: true
+    },
+
+    {
+      path: 'good/order/query',
+      component: () => import('@/xt_pages/supply/goodOrderQuery'),
+      name: 'goodOrderQuery',
+      meta: { title: 'goodOrderQuery', noCache: true }
+    },
+    {
+      path: '/good/order/add',
+      component: () => import('@/xt_pages/supply/components/addGoodOrder'),
+      name: 'addGoodOrder',
+      meta: { title: 'addGoodOrder', noCache: true },
+      hidden: true,
+      is_menu: false,
+      isChild: true
     }
+
   ]
 }

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -640,7 +640,7 @@
                 </td> -->
                         <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
                         <td height="32px">
-                          <img v-if="advice.id > 0" style="height:20px;" src="https://images.shengws.com/FgnRnBcx1BgULJ1dn7VKzeBPEvtm" alt="" srcset="" />
+                          <!-- <img v-if="advice.id > 0" style="height:20px;" src="https://images.shengws.com/FgnRnBcx1BgULJ1dn7VKzeBPEvtm" alt="" srcset="" /> -->
                           <span v-if="setAdminUserES(advice.advice_doctor) == ''">{{ getAdminUser(advice.advice_doctor) }}</span>
                           <img style="height:20px;" :src="setAdminUserES(advice.advice_doctor)" alt="" srcset="" v-else />
                         </td>
@@ -1014,8 +1014,8 @@
                     <div class="inline_block" style="flex:1;">
                       治疗医生：
                       <div class="under_line" style="width: 80px">
-                        <img style="height:20px;" src="https://images.shengws.com/FgnRnBcx1BgULJ1dn7VKzeBPEvtm" alt="" srcset="" />
-                        <!--<img style="height:20px;" src="https://images.shengws.com/FgnRnBcx1BgULJ1dn7VKzeBPEvtm" alt="" srcset="">-->
+                        <!-- <img style="height:20px;" src="https://images.shengws.com/FgnRnBcx1BgULJ1dn7VKzeBPEvtm" alt="" srcset="" /> -->
+                       
                         <span v-if="setAdminUserES(prescription.prescription_doctor) == ''">{{ getAdminUser(prescription.prescription_doctor) }}</span>
                         <img style="height:20px;" :src="setAdminUserES(prescription.prescription_doctor)" alt="" srcset="" v-else />
                       </div>

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -301,7 +301,7 @@ export default {
           id: obj.order_id,
 
         }
-        if(this.org_id == 10138 || this.org_id == 0 || this.$store.getters.xt_user.org_id == 4){
+        if(this.org_id == 10138 || this.org_id == 0 || this.$store.getters.xt_user.org_id == 4 || this.org_id == 10278){
           getPrivateExpenses(params).then(response => {
             if (response.data.state == 0) {
               // this.$message.error(response.data.msg)

src/xt_pages/sign/lineUp.vue

@@ -77,38 +77,46 @@
                     <div class="callingBox">
                         <div :class="(queueConfig.jzjhyc == 1 && queueConfig.sjjhyc == 0) ? 'callingBoxLeft1' : 'callingBoxLeft'" v-if="queueConfig.jzjhyc == 1">
                             <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
-                            <div style="flex: 1;">
+                            <div style="flex: 1;justify-content: space-between;display: flex;flex-direction: column;">
                                 <div class="callingTop" style="margin-bottom:10px;">
                                     <div class="callingTopTip"><span style="margin: 0 auto;">正在<br />接诊</span></div>
                                     <div class="callingContent">
-                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in (receivingPatient || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                        <p><span v-for="(item,index) in (receivingPatient || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <div>
+                                            <p><span v-for="(item,index) in (receivingPatient || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
+                                            <p><span v-for="(item,index) in (receivingPatient || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        </div>
                                     </div>
                                 </div>
                                 <div class="callingTop" style="border-radius: 0 0 15px 0;">
                                     <div class="callingTopTip"><span style="margin: 0 auto;">等待<br />接诊</span></div>
                                     <div class="callingContent">
-                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in (waitDoctorList || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                        <p><span v-for="(item,index) in (waitDoctorList || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <div>
+                                            <p><span v-for="(item,index) in (waitDoctorList || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
+                                            <p><span v-for="(item,index) in (waitDoctorList || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
                         <div :class="(queueConfig.jzjhyc == 0 && queueConfig.sjjhyc == 1) ? 'callingBoxLeft1' : 'callingBoxLeft'" v-if="queueConfig.sjjhyc == 1">
                             <div class="callingTitle newCallingTitle"><span style="margin: 0 auto;">上<br />机<br />叫<br />号</span></div>
-                            <div style="flex: 1;">
+                            <div style="flex: 1;justify-content: space-between;display: flex;flex-direction: column;">
                                 <div class="callingTop" style="margin-bottom:10px;">
                                     <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">正在<br />叫号</span></div>
                                     <div class="callingContent newCallingContent">
-                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in (upPatientList || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                        <p><span v-for="(item,index) in (upPatientList || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <div>
+                                            <p><span v-for="(item,index) in (upPatientList || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
+                                            <p><span v-for="(item,index) in (upPatientList || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        </div>
                                     </div>
                                 </div>
                                 <div class="callingTop" style="border-radius: 0 0 15px 0;">
                                     <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">等待<br />叫号</span></div>
                                     <div class="callingContent newCallingContent">
-                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in (receivingPatient || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                        <p><span v-for="(item,index) in (receivingPatient || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <div>
+                                            <p><span v-for="(item,index) in (receivingPatient || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
+                                            <p><span v-for="(item,index) in (receivingPatient || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -117,6 +125,91 @@
                 </div>
                 
             </div>
+        
+            <!-- <div class="page_lineUp">
+                <div class="lineUpTitle">
+                    <div>{{ this.$store.getters.xt_user.org.org_name }}<span>&nbsp;&nbsp;温馨提示：请注意排队叫号，依次叫号就诊上机，谢谢配合</span></div>
+                    <div>{{ newdate }}&nbsp;&nbsp;{{ time }}</div>
+                </div>
+                <div class="lineUpMain">
+                    <div class="lineUpMainLeft">
+                        <div class="lineUpMainLeftTitle">
+                            <p style="width:12%">排队号</p>
+                            <p style="width:14%">姓名</p>
+                            <p style="width:14%">病例号</p>
+                            <p style="width:14%">床位号</p>
+                            <p style="width:14%">治疗状态</p>
+                            <p style="width:14%">上机时间</p>
+                            <p style="width:16%">预计下机时间</p>
+                        </div>
+                        <div class="lineUpList">
+                            <div class="lineUpListOne" v-for="(item,index) in 6" :key="index">
+                                <p style="width:12%">
+                                    <span>上午</span>
+                                    {{ 89 }}号
+                                </p>
+                                <p style="width:14%">{{ '张三' }}</p>
+                                <p style="width:14%">{{ 3023 }}</p>
+                                <p style="width:14%">{{ 'A区' + '098' }}</p>
+                                <p style="width:14%">
+                                    <span>待接诊</span>
+                                </p>
+                                <p style="width:14%">07:38:00</p>
+                                <p style="width:16%">07:38:00</p>
+                            </div>
+                        </div>
+                    </div> 
+                    <div class="callingBox">
+                        <div class="callingBoxLeft">
+                            <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
+                            <div style="flex: 1;justify-content: space-between;display: flex;flex-direction: column;">
+                                <div class="callingTop">
+                                    <div class="callingTopTip"><span style="margin: 0 auto;">正在<br />接诊</span></div>
+                                    <div class="callingContent">
+                                        <div>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="callingTop" style="border-radius: 0 0 15px 0;">
+                                    <div class="callingTopTip"><span style="margin: 0 auto;">等待<br />接诊</span></div>
+                                    <div class="callingContent">
+                                        <div>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="callingBoxLeft">
+                            <div class="callingTitle newCallingTitle"><span style="margin: 0 auto;">上<br />机<br />叫<br />号</span></div>
+                            <div style="flex: 1;justify-content: space-between;display: flex;flex-direction: column;">
+                                <div class="callingTop">
+                                    <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">正在<br />叫号</span></div>
+                                    <div class="callingContent newCallingContent">
+                                        <div>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="callingTop" style="border-radius: 0 0 15px 0;">
+                                    <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">等待<br />叫号</span></div>
+                                    <div class="callingContent newCallingContent">
+                                        <div>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                
+            </div> -->
         </div>
         <div class="app-container">
             <div class="page_lineUp">
@@ -161,38 +254,46 @@
                     <div class="callingBox">
                         <div :class="(queueConfig.jzjhyc == 1 && queueConfig.sjjhyc == 0) ? 'callingBoxLeft1' : 'callingBoxLeft'" v-if="queueConfig.jzjhyc == 1">
                             <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
-                            <div style="flex: 1;">
+                            <div style="flex: 1;justify-content: space-between;display: flex;flex-direction: column;">
                                 <div class="callingTop" style="margin-bottom:10px;">
                                     <div class="callingTopTip"><span style="margin: 0 auto;">正在<br />接诊</span></div>
                                     <div class="callingContent">
-                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in (receivingPatient || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                        <p><span v-for="(item,index) in (receivingPatient || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <div>
+                                            <p><span v-for="(item,index) in (receivingPatient || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
+                                            <p><span v-for="(item,index) in (receivingPatient || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        </div>
                                     </div>
                                 </div>
                                 <div class="callingTop" style="border-radius: 0 0 15px 0;">
                                     <div class="callingTopTip"><span style="margin: 0 auto;">等待<br />接诊</span></div>
                                     <div class="callingContent">
-                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in (waitDoctorList || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                        <p><span v-for="(item,index) in (waitDoctorList || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <div>
+                                            <p><span v-for="(item,index) in (waitDoctorList || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
+                                            <p><span v-for="(item,index) in (waitDoctorList || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
                         <div :class="(queueConfig.jzjhyc == 0 && queueConfig.sjjhyc == 1) ? 'callingBoxLeft1' : 'callingBoxLeft'" v-if="queueConfig.sjjhyc == 1">
                             <div class="callingTitle newCallingTitle"><span style="margin: 0 auto;">上<br />机<br />叫<br />号</span></div>
-                            <div style="flex: 1;">
+                            <div style="flex: 1;justify-content: space-between;display: flex;flex-direction: column;">
                                 <div class="callingTop" style="margin-bottom:10px;">
                                     <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">正在<br />叫号</span></div>
                                     <div class="callingContent newCallingContent">
-                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in (upPatientList || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                        <p><span v-for="(item,index) in (upPatientList || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <div>
+                                            <p><span v-for="(item,index) in (upPatientList || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
+                                            <p><span v-for="(item,index) in (upPatientList || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        </div>
                                     </div>
                                 </div>
                                 <div class="callingTop" style="border-radius: 0 0 15px 0;">
                                     <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">等待<br />叫号</span></div>
                                     <div class="callingContent newCallingContent">
-                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in (receivingPatient || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                        <p><span v-for="(item,index) in (receivingPatient || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <div>
+                                            <p><span v-for="(item,index) in (receivingPatient || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
+                                            <p><span v-for="(item,index) in (receivingPatient || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -201,6 +302,91 @@
                 </div>
                 
             </div>
+        
+            <!-- <div class="page_lineUp">
+                <div class="lineUpTitle">
+                    <div>{{ this.$store.getters.xt_user.org.org_name }}<span>&nbsp;&nbsp;温馨提示：请注意排队叫号，依次叫号就诊上机，谢谢配合</span></div>
+                    <div>{{ newdate }}&nbsp;&nbsp;{{ time }}</div>
+                </div>
+                <div class="lineUpMain">
+                    <div class="lineUpMainLeft">
+                        <div class="lineUpMainLeftTitle">
+                            <p style="width:12%">排队号</p>
+                            <p style="width:14%">姓名</p>
+                            <p style="width:14%">病例号</p>
+                            <p style="width:14%">床位号</p>
+                            <p style="width:14%">治疗状态</p>
+                            <p style="width:14%">上机时间</p>
+                            <p style="width:16%">预计下机时间</p>
+                        </div>
+                        <div class="lineUpList">
+                            <div class="lineUpListOne" v-for="(item,index) in 6" :key="index">
+                                <p style="width:12%">
+                                    <span>上午</span>
+                                    {{ 89 }}号
+                                </p>
+                                <p style="width:14%">{{ '张三' }}</p>
+                                <p style="width:14%">{{ 3023 }}</p>
+                                <p style="width:14%">{{ 'A区' + '098' }}</p>
+                                <p style="width:14%">
+                                    <span>待接诊</span>
+                                </p>
+                                <p style="width:14%">07:38:00</p>
+                                <p style="width:16%">07:38:00</p>
+                            </div>
+                        </div>
+                    </div> 
+                    <div class="callingBox">
+                        <div class="callingBoxLeft">
+                            <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
+                            <div style="flex: 1;justify-content: space-between;display: flex;flex-direction: column;">
+                                <div class="callingTop">
+                                    <div class="callingTopTip"><span style="margin: 0 auto;">正在<br />接诊</span></div>
+                                    <div class="callingContent">
+                                        <div>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="callingTop" style="border-radius: 0 0 15px 0;">
+                                    <div class="callingTopTip"><span style="margin: 0 auto;">等待<br />接诊</span></div>
+                                    <div class="callingContent">
+                                        <div>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="callingBoxLeft">
+                            <div class="callingTitle newCallingTitle"><span style="margin: 0 auto;">上<br />机<br />叫<br />号</span></div>
+                            <div style="flex: 1;justify-content: space-between;display: flex;flex-direction: column;">
+                                <div class="callingTop">
+                                    <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">正在<br />叫号</span></div>
+                                    <div class="callingContent newCallingContent">
+                                        <div>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="callingTop" style="border-radius: 0 0 15px 0;">
+                                    <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">等待<br />叫号</span></div>
+                                    <div class="callingContent newCallingContent">
+                                        <div>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                            <p><span v-for="(item,index) in 3" :key="index">张三三、</span></p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                
+            </div> -->
         </div>
     </div>
 </template>
@@ -505,26 +691,32 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.main-contain{
+    height: 100%;
+}
 .page_lineUp{
+    height: 100%;
     .lineUpTitle{
-        height: 50px;
+        height: 4vh;
         background: #1A82BF;
         display: flex;
         justify-content: space-between;
         align-items: center;
         padding: 0 20px;
         color:#fff;
-        font-size: 20px;
+        font-size: 2vh;
         font-weight: 600;
     }
     .lineUpMain{
         background: linear-gradient(0deg, #76ECEC, #479CD2);
-        height: 1080px;
+        height: 95%;
         padding:10px;
     }
     .lineUpMainLeft{
-        height: 620px;
+        height: 60%;
         border-radius: 15px;
+        display: flex;
+        flex-direction: column;
         
     }
     .lineUpMainLeftTitle{
@@ -532,9 +724,9 @@ export default {
         justify-content: space-between;
         align-items: center;
         color:#fff;
-        font-size: 38px;
+        font-size: 4vh;
         font-weight: 600;
-        height:80px;
+        height:7vh;
         background: #1A82BF;
         border-radius: 15px 15px 0 0;
         >p{
@@ -542,8 +734,9 @@ export default {
         }
     }
     .lineUpList{
-        font-size: 35px;
+        font-size: 3vh;
         font-weight: 600;
+        flex: 1;
         >div:nth-child(odd){
             background: #F9FDFF;
         }
@@ -554,7 +747,7 @@ export default {
             border-radius: 0 0 15px 15px;
         }
         .lineUpListOne{
-            height:90px;
+            height:16%;
             display: flex;
             justify-content: space-between;
             align-items: center;
@@ -566,7 +759,7 @@ export default {
         }
     }
     .callingBox{
-        height: 430px;
+        height: 39%;
         margin-top: 10px;
         display: flex;
         justify-content: space-between;
@@ -577,16 +770,16 @@ export default {
             justify-content: space-between;
         }
         .callingBoxLeft1{
-            width: 99.5%;
+            width: 100%;
             height: 100%;
             display: flex;
             justify-content: space-between;
         }
         .callingTitle{
-            width: 130px;
+            width: 10vh;
             height: 100%;
             border-radius: 15px 0 0 15px;
-            font-size: 66px;
+            font-size: 5vh;
             font-weight:600;
             text-align: center;
             color: #fff;
@@ -599,16 +792,16 @@ export default {
             background: #1aa680;
         }
         .callingTop{
-            height: 210px;
+            height: 49.5%;
             border-radius: 0 15px 0 0;
             background: #F9FDFF;
             display: flex;
             justify-content: space-between;
             .callingTopTip{
-                width: 130px;
+                width: 10vh;
                 height: 100%;
                 color: #fff;
-                font-size: 40px;
+                font-size: 3vh;
                 font-weight: 600;
                 background: #1A82BF;
                 display: flex;
@@ -621,15 +814,19 @@ export default {
                 flex: 1;
                 display: flex;
                 flex-direction: column;
-                font-size: 50px;
+                font-size: 4vh;
                 color:#1C6895;
                 font-weight: 600;
                 padding-left: 20px;
+                justify-content: space-around;
                 >p{
                     width:100%;
                     text-align: left;
                     line-height: 50px;
                 }
+                div>:first-child{
+                    margin-bottom: 10px;
+                }
             }
             .newCallingContent{
                 color:#1aa680;
@@ -648,6 +845,7 @@ export default {
   background: #fff;
   padding: 20px;
   z-index:5000;
+  height: 100%;
 }
 #fullscreenbroad #fullscreenbroad-setting {
   float: right;

src/xt_pages/sign/signIn.vue

@@ -41,7 +41,7 @@
                     <div>{{ newdate }}&nbsp;&nbsp;{{ time }}</div>
                 </div>
                 <div class="signInMain">
-                    <div style="display: flex;justify-content: space-between;padding:10px;">
+                    <div style="display: flex;justify-content: space-between;padding:10px;height:100%;">
                         <div :class="Object.keys(queueInfo).length>0 ? 'signInMainLeft' : 'signInMainLeft100'">
                             <div class="signInMainLeftTitle">
                                 <p>排队号</p>
@@ -82,6 +82,50 @@
                     </div>
                 </div>
             </div>
+        
+            <!-- <div class="page_signIn">
+                <div class="signInTitle">
+                    <div>{{ this.$store.getters.xt_user.org.org_name }}</div>
+                    <div>{{ newdate }}&nbsp;&nbsp;{{ time }}</div>
+                </div>
+                <div class="signInMain">
+                    <div style="display: flex;justify-content: space-between;padding:10px;height:100%;">
+                        <div class="signInMainLeft">
+                            <div class="signInMainLeftTitle">
+                                <p>排队号</p>
+                                <p>姓名</p>
+                                <p>病历号</p>
+                                <p>签到时间</p>
+                            </div>
+                            <div class="signInList">
+                                <div class="signInListOne" v-for="(item,index) in 10" :key="index">
+                                    <p>
+                                        上午2号
+                                    </p>
+                                    <p>张三</p>
+                                    <p>400001</p>
+                                    <p>07:00</p>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="signInMainRight">
+                            <div class="signInMainRightTitle"><span style="margin:0 auto;">张三</span></div>
+                            <div class="signInMainRightContent">
+                                <p style="margin: 0 auto;display:flex;align-items: center;"><span>排队号</span></p>
+                                <p style="margin: 0 auto;display:flex;align-items: center;">
+                                    <span>上午</span>
+                                    <span style="font-size:7vw">69号</span>
+                                </p>
+                            </div>
+                            <div class="signInMianRightBottom"><span style="margin:0 auto;">签到成功</span></div>
+                        </div>
+                    </div>
+                    <div class="signInTip">
+                        温馨提示：请注意排队叫号，依次叫号就诊上机，谢谢配合
+                    </div>
+                </div>
+            </div> -->
+        
         </div>
         <div class="app-container">
             <div class="page_signIn">
@@ -90,7 +134,7 @@
                     <div>{{ newdate }}&nbsp;&nbsp;{{ time }}</div>
                 </div>
                 <div class="signInMain">
-                    <div style="display: flex;justify-content: space-between;padding:10px;">
+                    <div style="display: flex;justify-content: space-between;padding:10px;height:100%;">
                         <div :class="Object.keys(queueInfo).length>0 ? 'signInMainLeft' : 'signInMainLeft100'">
                             <div class="signInMainLeftTitle">
                                 <p>排队号</p>
@@ -120,7 +164,7 @@
                                     <span v-if="queueInfo.schedule_type == 1">上午</span>
                                     <span v-if="queueInfo.schedule_type == 2">下午</span>
                                     <span v-if="queueInfo.schedule_type == 3">晚上</span>
-                                    <span style="font-size:180px;">{{ queueInfo.queue_no }}号</span>
+                                    <span style="font-size:7vw;">{{ queueInfo.queue_no }}号</span>
                                 </p>
                             </div>
                             <div class="signInMianRightBottom"><span style="margin:0 auto;" v-if='Object.keys(queueInfo).length>0'>签到成功</span></div>
@@ -131,6 +175,49 @@
                     </div>
                 </div>
             </div>
+        
+            <!-- <div class="page_signIn">
+                <div class="signInTitle">
+                    <div>{{ this.$store.getters.xt_user.org.org_name }}</div>
+                    <div>{{ newdate }}&nbsp;&nbsp;{{ time }}</div>
+                </div>
+                <div class="signInMain">
+                    <div style="display: flex;justify-content: space-between;padding:10px;height:100%;">
+                        <div class="signInMainLeft">
+                            <div class="signInMainLeftTitle">
+                                <p>排队号</p>
+                                <p>姓名</p>
+                                <p>病历号</p>
+                                <p>签到时间</p>
+                            </div>
+                            <div class="signInList">
+                                <div class="signInListOne" v-for="(item,index) in 10" :key="index">
+                                    <p>
+                                        上午2号
+                                    </p>
+                                    <p>张三</p>
+                                    <p>400001</p>
+                                    <p>07:00</p>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="signInMainRight">
+                            <div class="signInMainRightTitle"><span style="margin:0 auto;">张三</span></div>
+                            <div class="signInMainRightContent">
+                                <p style="margin: 0 auto;display:flex;align-items: center;"><span>排队号</span></p>
+                                <p style="margin: 0 auto;display:flex;align-items: center;">
+                                    <span>上午</span>
+                                    <span style="font-size:7vw">69号</span>
+                                </p>
+                            </div>
+                            <div class="signInMianRightBottom"><span style="margin:0 auto;">签到成功</span></div>
+                        </div>
+                    </div>
+                    <div class="signInTip">
+                        温馨提示：请注意排队叫号，依次叫号就诊上机，谢谢配合
+                    </div>
+                </div>
+            </div> -->
         </div>
     </div>
 </template>
@@ -341,42 +428,50 @@ export default {
 
 
 <style lang="scss" scoped>
+.main-contain{
+    height: 100%;
+}
 .page_signIn{
+    height: 98%;
     .signInTitle{
-        height: 50px;
+        height: 4vh;
         background: #1A82BF;
         display: flex;
         justify-content: space-between;
         align-items: center;
         padding: 0 20px;
         color:#fff;
-        font-size: 20px;
+        font-size: 2vh;
         font-weight: 600;
     }
     .signInMain{
         background: linear-gradient(0deg, #76ECEC, #479CD2);
-        height: 1040px;
+        height: 86%;
         
         
     }
     .signInMainLeft{
-        width:69%;
-        height: 980px;
+        width:70%;
+        // height: 100%;
         border-radius: 15px;
+        display: flex;
+        flex-direction: column;
     }
     .signInMainLeft100{
         width:100%;
-        height: 980px;
+        height: 100%;
         border-radius: 15px;
+        display: flex;
+        flex-direction: column;
     }
     .signInMainLeftTitle{
         display: flex;
         justify-content: space-between;
         align-items: center;
         color:#fff;
-        font-size: 38px;
+        font-size: 4vh;
         font-weight: 600;
-        height:80px;
+        height:7vh;
         background: #1A82BF;
         border-radius: 15px 15px 0 0;
         >p{
@@ -385,16 +480,17 @@ export default {
         }
     }
     .signInList{
-        font-size: 36px;
+        font-size: 3vh;
         font-weight: 600;
+        flex: 1;
         >div:nth-child(1){
-            font-size: 50px;
+            font-size: 4.5vh;
         }
         >div:nth-child(2){
-            font-size: 50px;
+            font-size: 4.5vh;
         }
         >div:nth-child(3){
-            font-size: 50px;
+            font-size: 4.5vh;
         }
         >div:nth-child(odd){
             background: #F9FDFF;
@@ -406,7 +502,7 @@ export default {
             border-radius: 0 0 15px 15px;
         }
         .signInListOne{
-            height:90px;
+            height:10%;
             display: flex;
             justify-content: space-between;
             align-items: center;
@@ -419,16 +515,17 @@ export default {
     }
     .signInMainRight{
         width: 30%;
-        height: 980px;
+        // height: 100%;
+        margin-left: 10px;
     }
     .noneSignInMainRight{
         display: none;
     }
     .signInMainRightTitle{
-        height: 260px;
+        height: 27.5%;
         border-radius: 15px 15px 0 0;
         background: #1A82BF;
-        font-size: 120px;
+        font-size: 14vh;
         font-weight: 600;
         color:#fff;
         display: flex;
@@ -437,22 +534,22 @@ export default {
     }
     .signInMainRightContent{
         background: #F9FDFF;
-        height: 450px;
+        height: 54.5%;
         text-align: center;
         font-weight: 600;
         color:#1C6895;
         box-sizing: border-box;
-        font-size:90px;
+        font-size:8vh;
         display:flex;
         align-items:center;
         flex-direction: column;
         justify-content: space-around;
     }
     .signInMianRightBottom{
-        height: 270px;
+        height: 18%;
         background: #1A82BF;
         border-radius: 0 0 15px 15px;
-        font-size: 90px;
+        font-size: 8vh;
         font-weight: 600;
         color:#fff;
         display: flex;
@@ -461,14 +558,13 @@ export default {
     }
     .signInTip{
         color:#fff;
-        font-size: 18px;
+        font-size: 1.5vw;
         font-weight: 600;
         display: flex;
         align-items: center;
-        height: 50px;
+        height: 3vw;
         background: linear-gradient(0deg, #42A9E7, #3686B9, #42A9E7);
-        margin-top: 1px;
-        padding-left:20px;
+        padding-left:2vw;
     }
 }
 #fullscreenbroad {
@@ -482,6 +578,7 @@ export default {
   background: #fff;
   padding: 20px;
   z-index:5000;
+  height: 100%;
 }
 #fullscreenbroad #fullscreenbroad-setting {
   float: right;

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -71,46 +71,7 @@
       </div>
     </div>
 
-    
-
-    <!-- <div class="cell clearfix">
-      <label class="title"><span class="name">单据类型</span> : </label>
-      <el-select
-        size="small"
-        v-model="order_type"
-        clearable
-        placeholder="单据类型"
-        @change="changeType"
-      >
-        <el-option
-          v-for="item in orderTypeArr"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        >
-        </el-option>
-      </el-select>
-    </div> -->
-
-    <!-- <div class="cell clearfix">
-      <label class="title"><span class="name">其它</span> : </label>
-      <el-select
-        size="small"
-        v-model="manufacturer_id"
-        clearable
-        placeholder="厂商"
-        @change="changeManufacturer"
-      >
-        <el-option
-          v-for="item in manufacturer"
-          :key="item.id"
-          :label="item.manufacturer_name"
-          :value="item.id"
-        >
-        </el-option>
-      </el-select>
-    </div> -->
-
+  
     <el-row :gutter="12" style="margin-top: 10px">
       <el-table
         :data="tableData"
@@ -166,8 +127,11 @@
         </el-table-column>
         <el-table-column label="出货价" align="center">
           <template slot-scope="scope">
-           <span v-if="org_id == 9919 || org_id == 9671">{{scope.row.last_price}} </span> 
-           <span v-else>{{scope.row.price}}</span>
+           <span v-if="org_id == 9919">{{scope.row.last_price}} </span> 
+           <span v-else>
+             <span v-if="scope.row.price >0"> {{scope.row.price}}</span>
+            <span v-if="scope.row.price  == 0"> {{getPrice(scope.row.drug_id)}}</span>
+           </span>
           </template>
         </el-table-column>
         <el-table-column label="数量" align="center">
@@ -177,8 +141,12 @@
         </el-table-column>
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
-            
-            {{scope.row.total_price}}
+           <span v-if="org_id == 9919">{{(scope.row.last_price * scope.row.count).toFixed(2)}} </span> 
+           <span v-else>
+             <span v-if="scope.row.price >0">{{(scope.row.last_price * scope.row.count).toFixed(2)}}</span>
+             <span v-if="scope.row.price  == 0">{{(getPrice(scope.row.drug_id)* scope.row.count).toFixed(2)}}</span>
+           </span>
+            <!-- {{scope.row.total_price}} -->
           </template>
         </el-table-column>
       </el-table>
@@ -424,12 +392,20 @@ export default {
           for(let i=0;i<order.length;i++){
              order[i].specification_name  = order[i].dose + order[i].dose_unit + "*" + order[i].min_number +  order[i].min_unit + "/" + order[i].max_unit
              order[i].is_total = 0
-             if(this.org_id == 9919 || this.org_id == 9671){
+             if(this.org_id == 9919){
                order[i].total_price = order[i].count * order[i].last_price
                total_price += order[i].count * order[i].last_price
              }else{
-                order[i].total_price = order[i].count * order[i].price
-                total_price += order[i].count * order[i].price
+               if(order[i].price > 0){
+                 order[i].total_price = order[i].count * order[i].price
+                 total_price += order[i].count * order[i].price
+               }
+               if(order[i].price ==0 ){
+                  order[i].total_price = order[i].count * this.getPrice(order[i].drug_id)
+                  total_price += order[i].count * this.getPrice(order[i].drug_id)
+                  order[i].price = this.getPrice(order[i].drug_id)
+               } 
+               
              }
             
           }
@@ -451,7 +427,7 @@ export default {
            let objInfo = {}
           order.forEach((item,index)=>{
              let { drug_id } = item
-             if(this.org_id == 9671 || this.org_id == 9919){
+             if( this.org_id == 9919){
               if(!objInfo[drug_id]){
                 objInfo[drug_id] = {
                   drug_id,
@@ -540,7 +516,7 @@ export default {
           this.tablePrint[i].index = i+1
         }
         for(let i=0;i<this.tablePrint.length;i++){
-           if(this.org_id == 9671 || this.org_id == 9919 ){
+           if(this.org_id == 9919 ){
            
              this.tablePrint[i].count = this.getCountSix(this.tablePrint[i].drug_id,this.tablePrint[i].child)
              this.tablePrint[i].total_price = this.getCountSenven(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].price)
@@ -795,6 +771,15 @@ export default {
           }
         }
         return name
+      },
+      getPrice(drug_id){
+        var price = ""
+        for(let i=0;i<this.drugList.length;i++){
+          if(drug_id == this.drugList[i].id){
+             price = this.drugList[i].min_price
+          }
+        }
+        return price
       } 
   }
 };

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -109,7 +109,8 @@
        
         <el-table-column prop="drug_name" label="单价" align="center">
            <template slot-scope="scope">
-              <span>{{scope.row.price}}</span>
+              <span v-if="scope.row.price >0">{{scope.row.price}}</span>
+              <span v-if="scope.row.price == 0">{{getPrice(scope.row.drug_id)}}</span>
            </template>
         </el-table-column>
          <el-table-column prop="drug_name" label="有效期" align="center">
@@ -268,6 +269,7 @@
             this.total = total
             var manufacturerList = response.data.data.manufacturerList
             this.manufacturerList = manufacturerList
+            this.drug =  response.data.data.drug
          
            }
          })  
@@ -518,6 +520,13 @@
            name = this.drug.drug_name
         }
         return name
+     },
+     getPrice(id){
+       var min_price = 0 
+       if(id == this.drug.id){
+         min_price = this.drug.min_price
+       }
+       return min_price
      }
     }
   }

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -593,55 +593,55 @@ export default {
         return "";
       }
     },
-    showDialog(index, row) {
-      this.currentIndex = index;
-      const loading = this.$loading({
-        lock: true,
-        text: "Loading",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)"
-      });
-
-      const params = {
-        manufacturer_id: this.form.manufacturer,
-        dealer_id: this.form.dealer
-      };
-      GetAllDrugInfoByID(params).then(response => {
-        if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
-        } else {
-          if (response.data.data.drugs.length <= 0) {
-            this.$message.error("该厂商或经销商没有药品信息");
-            loading.close();
-
-            return;
-          }
-          this.$refs.dialog.show();
-          for (let i = 0; i < response.data.data.drugs.length; i++) {
-            this.propForm.goods.push(
-              response.data.data.drugs[i]
-            );
-          }
-          const obj = {};
-          this.propForm.goods = this.propForm.goods.reduce(
-            (cur, next) => {
-              obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
-              return cur;
-            },
-            []
-          ); // 设置cur默认类型为数组，并且初始值为空的数组
-        }
-
-        for (let i = 0; i < this.propForm.goods.length; i++) {
-          for (let a = 0; a < this.propForm.goods[i].drug_specs.length; a++) {
-            var respObj = this.propForm.goods[i].drug_specs[a];
-            respObj["isSelected"] = false;
-          }
-        }
-        loading.close();
-      });
-    },
+    // showDialog(index, row) {
+    //   this.currentIndex = index;
+    //   const loading = this.$loading({
+    //     lock: true,
+    //     text: "Loading",
+    //     spinner: "el-icon-loading",
+    //     background: "rgba(0, 0, 0, 0.7)"
+    //   });
+
+    //   const params = {
+    //     manufacturer_id: this.form.manufacturer,
+    //     dealer_id: this.form.dealer
+    //   };
+    //   GetAllDrugInfoByID(params).then(response => {
+    //     if (response.data.state == 0) {
+    //       this.$message.error(response.data.msg);
+    //       return false;
+    //     } else {
+    //       if (response.data.data.drugs.length <= 0) {
+    //         this.$message.error("该厂商或经销商没有药品信息");
+    //         loading.close();
+
+    //         return;
+    //       }
+    //       this.$refs.dialog.show();
+    //       for (let i = 0; i < response.data.data.drugs.length; i++) {
+    //         this.propForm.goods.push(
+    //           response.data.data.drugs[i]
+    //         );
+    //       }
+    //       const obj = {};
+    //       this.propForm.goods = this.propForm.goods.reduce(
+    //         (cur, next) => {
+    //           obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
+    //           return cur;
+    //         },
+    //         []
+    //       ); // 设置cur默认类型为数组，并且初始值为空的数组
+    //     }
+
+    //     for (let i = 0; i < this.propForm.goods.length; i++) {
+    //       for (let a = 0; a < this.propForm.goods[i].drug_specs.length; a++) {
+    //         var respObj = this.propForm.goods[i].drug_specs[a];
+    //         respObj["isSelected"] = false;
+    //       }
+    //     }
+    //     loading.close();
+    //   });
+    // },
     back() {
       this.$router.go(-1);
     },
@@ -712,6 +712,7 @@ export default {
       });
     },
     GetOrderDetail: function(order_id) {
+      this.listLoading = true
       const params = {
         id: order_id
       };
@@ -789,6 +790,7 @@ export default {
             this.warehouse.warehousing_time,
             "{y}-{m}-{d}"
           );
+          this.listLoading = false
         }
       });
     },
@@ -877,7 +879,7 @@ export default {
   created() {
    
     this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
-    this.GetConfigInfo();
+    //this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;
     const order_id = this.$route.query.id;
     this.GetOrderDetail(order_id);

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -224,7 +224,8 @@
           </el-table-column>
           <el-table-column label="出货单价" align="center">
             <template slot-scope="scope">
-              {{scope.row.price}}
+              <span v-if="scope.row.price > 0"> {{scope.row.price}}</span>
+              <span v-if="scope.row.price == 0"> {{scope.row.retail_price}}</span>
             </template>
           </el-table-column>
           <!-- <el-table-column label="拆零零售价" align="center">
@@ -234,7 +235,8 @@
           </el-table-column> -->
           <el-table-column label="总价" align="center">
             <template slot-scope="scope">
-              <span>{{getAllPriceOne(scope.row.drug_id,scope.row.price,scope.row.min_price).toFixed(2)}}</span>
+              <span v-if="scope.row.price > 0">{{getAllPriceOne(scope.row.drug_id,scope.row.price,scope.row.min_price).toFixed(2)}}</span>
+              <span v-if="scope.row.price == 0">{{getAllPriceOne(scope.row.drug_id,scope.row.retail_price,scope.row.min_price).toFixed(2)}}</span>
             </template>
           </el-table-column>
           <el-table-column label="生产厂家" align="center">
@@ -916,7 +918,7 @@ export default {
           this.tableShow = true
           this.tableList = []
           var list =  response.data.data.list
-     
+         
          this.manufacturerList = response.data.data.manufacturerList
          this.dealerList = response.data.data.dealerList
          var drugFlowList = response.data.data.drugFlowList

src/xt_pages/supply/components/addGoodOrder.vue

@@ -0,0 +1,688 @@
+<template>
+<div class="main-contain">
+<div class="position">
+    <bread-crumb :crumbs="crumbs"></bread-crumb>
+</div>
+<div class="app-container"  v-loading="loading">
+    <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
+    <div>
+        <span style="color:red">*</span><span>供应商:</span>
+        <el-select v-model="supplier_name" style="width:140px;margin-right:10px;" placeholder="请选择"
+        @change="changeTypeName">
+        <el-option
+            v-for="item in supplyList"
+            :key="item.id"
+            :label="item.supplier_name"
+            :value="item.id">
+        </el-option>
+        </el-select>
+        <span>单据日期:</span>
+        <el-date-picker
+        size="small"
+        v-model="start_time"
+        prefix-icon="el-icon-date"
+        :editable="false"
+        style="width: 196px;"
+        type="date"
+        placeholder="选择日期时间"
+        align="right"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
+        @change="startTimeChange"
+        ></el-date-picker>
+        <span>交货日期:</span>
+        <el-date-picker
+            size="small"
+            v-model="end_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="endTimeChange"
+        ></el-date-picker>
+        <span>单据编码:{{number}}</span>
+
+    </div>
+    <div>
+        <el-button size="small" type="primary" @click="toAdd">生成购货单</el-button>
+        <el-button size="small" type="primary" @click="updatePurchaseOrder">修改</el-button>
+        <el-button size="small" type="primary" @click="toPrint">打印</el-button>
+        <el-button size="small" type="primary" v-if="is_check == 2" @click="checkPurchaseOrder">审核</el-button>
+        <el-button size="small" type="primary" v-if="is_check == 1" @click="checkPurchaseOrder">反审核</el-button>
+       
+    </div>
+    </div>
+
+   <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
+    <el-table
+    :row-style="{ color: '#303133' }"
+    :header-cell-style="{
+        backgroundColor: 'rgb(245, 247, 250)',
+        color: '#606266'
+    }"
+    :data="recordInfo.tableList"
+    :class="signAndWeighBoxPatients"
+    border
+    style="width: 100%"
+    max-height="450"
+    >
+    <el-table-column align="center" width="200px">
+        <template slot="header" slot-scope="scope">
+            <span>商品<span style="color: red">*</span></span>
+        </template>
+        <template slot-scope="scope">
+           <el-form-item :prop="'tableList.' + scope.$index + '.name'" :rules='tableRules.name'>
+            <el-select v-model="scope.row.name" style="width:160px;" filterable placeholder="请选择" @change="changeName"   @input="changeGoodName(scope.$index)" :disabled="disabled">
+                <el-option
+                    v-for="(item,index) in tabList"
+                    :key="index"
+                    :label="item.supply_name"
+                    :value="item">
+                </el-option>
+             </el-select>
+           </el-form-item>
+        </template>
+    </el-table-column>
+    <el-table-column  align="center" width="150px">
+        <template slot="header" slot-scope="scope">
+            <span>商品类别</span>
+        </template>
+        <template slot-scope="scope">
+            <el-input v-model="scope.row.supply_type" style="width:120px" :disabled="true"></el-input>
+        </template>
+    </el-table-column>
+    <el-table-column label="规格&单位" align="center" width="200px">
+        <template slot-scope="scope">
+            <el-input v-model="scope.row.supply_specification_name" style="width:150px" :disabled="true"></el-input>
+        </template>
+    </el-table-column>
+     <el-table-column label="单位" align="center" width="120px">
+        <template slot="header" slot-scope="scope">
+            <span>单位<span style="color: red">*</span></span>
+        </template>
+        <template slot-scope="scope">
+          <el-form-item :prop="'tableList.' + scope.$index + '.supply_unit'" :rules='tableRules.supply_unit'>
+            <el-select v-model="scope.row.supply_unit" style="width:100px;" filterable placeholder="请选择"  :disabled="disabled">
+                    <el-option
+                        v-for="(item,index) in scope.row.unitList"
+                        :key="index"
+                        :label="item.name"
+                        :value="item.name">
+                    </el-option>
+             </el-select>
+          </el-form-item>  
+        </template>
+    </el-table-column>
+    <el-table-column label="可用库存" align="center" width="130px">
+        <template slot-scope="scope">
+            <el-input v-model="scope.row.supply_total" style="width:100px" :disabled="true"></el-input>
+        </template>
+    </el-table-column>
+    <el-table-column label="数量" align="center" width="120px">
+        <template slot="header" slot-scope="scope">
+            <span>数量<span style="color: red">*</span></span>
+        </template>
+        <template slot-scope="scope">
+          <el-form-item  :prop="'tableList.' + scope.$index + '.supply_count'" :rules='tableRules.supply_count'>
+             <el-input v-model="scope.row.supply_count" style="width:80px" :disabled="disabled"></el-input>
+          </el-form-item>
+        </template>
+    </el-table-column>
+
+    <el-table-column label="购货单价" align="center" width="120px">
+        <template slot-scope="scope">
+        <el-input v-model="scope.row.supply_price" style="width:80px" :disabled="disabled"></el-input>
+        </template>
+    </el-table-column>
+
+    <el-table-column label="购货金额" align="center" width="120px">
+        <template slot-scope="scope">
+          {{calculate(scope.row.supply_count * scope.row.supply_price)}}
+        </template>
+    </el-table-column>
+
+    <el-table-column label="生产厂商" align="center" width="200px">
+        <template slot-scope="scope">
+        <el-input v-model="scope.row.supply_manufacturer" style="width:160px" :disabled="true"></el-input>
+        </template>
+    </el-table-column>
+
+
+    <el-table-column label="批准文号" align="center" width="200px">
+        <template slot-scope="scope">
+        <el-input v-model="scope.row.supply_license_number" style="width:160px" :disabled="disabled"></el-input>
+        </template>
+    </el-table-column>
+
+    <el-table-column label="备注" align="center" width="200px">
+        <template slot-scope="scope">
+        <el-input v-model="scope.row.supply_remake" style="width:160px" :disabled="disabled"></el-input>
+        </template>
+    </el-table-column>
+
+    <el-table-column label="操作" align="center" width="150px" fixed="right" >
+        <template slot-scope="scope">
+        <el-tooltip class="item" effect="dark" content="新增" placement="top" >
+            <el-button
+                size="mini"
+                type="primary"
+                icon="el-icon-circle-plus-outline"
+                @click="handleEdit(scope.$index, scope.row)">
+            </el-button>
+       </el-tooltip>
+       <el-tooltip class="item" effect="dark" content="删除" placement="top">
+            <el-button
+                size="mini"
+                type="danger"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.$index, scope.row)">
+            </el-button>
+        </el-tooltip>
+
+        </template>
+    </el-table-column>
+  </el-table>
+</el-form>
+   <div style="margin-top:10px">
+      合计:{{getAllPrice()}} 元
+   </div>
+   <div style="margin-top:10px">
+        <span>优惠率:<el-input style="width:100px" v-model="rate_of_concession"></el-input>%</span>
+
+        <span>优惠金额:<el-input style="width:100px" v-model="discount_amount"></el-input></span>
+
+    </div>
+</div>
+
+  <!-- <el-dialog
+  title="提示"
+  :visible.sync="dialogVisible"
+  width="30%"
+  :before-close="handleClose">
+  <span>这是一段信息</span>
+  <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+  </span>
+  </el-dialog> -->
+</div>
+</template>
+
+<script>
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import {uParseTime } from '@/utils/tools'
+import {getInitOrder,updatePurchaseOrder,checkPurchaseOrder,getPurchaseOrderDetail} from "@/api/supply"
+export default {
+name: "addPurchaseOrder",
+components: {
+BreadCrumb
+},
+data() {
+return {
+    crumbs: [
+       { path: false, name: "购货单" },
+       { path: "/spply/query", name: "新增购货单" }
+    ],
+    showTwo:true,
+    showOne:false,
+    recordInfo: {
+      tableList:[],
+    },
+    keywords: "",
+    total: 0,
+    multipleSelection: [],
+    signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+    start_time: "",
+    end_time: "",
+    page: 1,
+    limit: 10,
+    goodType: [],
+    goodInfo: [],
+    org_id:0,
+    types:[],
+    tyep_name:"",
+    form:{
+    manufacturer_id:"",
+    },
+    tabList:[],
+    manufactuerList:[],
+    currentIndex: 0,
+    goodTypeList:[],
+    drugTypeList:[],
+    supplier_name:"",
+    supplyList:[],
+    rate_of_concession:"",
+    discount_amount:"",
+    start_time:new Date(),
+    end_time:new Date(),
+    tableRules: {
+     name: [{ required: true, message: '商品不能为空', trigger: 'blur' }],
+     supply_count: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
+   },
+   warehousing_id:0,
+   number:"",
+   loading:false,
+   drugList:[],
+   goodList:[],
+   id:0,
+   disabled:false,
+   is_check:0,
+   dialogVisible:false,
+  };
+},
+methods:{
+
+getInitOrder(){
+    getInitOrder().then(response=>{
+    if(response.data.state == 1){
+        var drugList = response.data.data.drugList
+        this.manufactuerList = response.data.data.manufactuerList
+        this.goodTypeList = response.data.data.goodTypeList
+        this.drugTypeList = response.data.data.drugTypeList
+        this.supplyList = response.data.data.supplyList
+       for(let i=0;i<drugList.length;i++){
+          for(let z=0;z<drugList[i].drug_warehouse_info.length;z++){
+            drugList[i].drug_warehouse_info[z].stock_max_number = drugList[i].drug_warehouse_info[z].stock_max_number * drugList[i].min_number
+          }
+        for(let j=0;j<this.manufactuerList.length;j++){
+            if(drugList[i].manufacturer == this.manufactuerList[j].id){
+                drugList[i].manufacturer = this.manufactuerList[j].manufacturer_name
+            }
+        }
+        for(let y=0;y<this.drugTypeList.length;y++){
+            if(drugList[i].drug_type == this.drugTypeList[y].value){
+            drugList[i].drug_type = this.drugTypeList[y].name
+            }
+        }
+        drugList[i].supply_name =  drugList[i].drug_name + " " + drugList[i].dose +drugList[i].dose_unit+"*"+drugList[i].min_number+ drugList[i].min_unit+"/"+drugList[i].max_unit + " " + drugList[i].manufacturer
+        drugList[i].supply_type = drugList[i].drug_type
+        drugList[i].supply_specification_name = drugList[i].dose +drugList[i].dose_unit+"*"+drugList[i].min_number+ drugList[i].min_unit+"/"+drugList[i].max_unit
+        drugList[i].supply_total = this.getWarehoseInfo(drugList[i].drug_warehouse_info,drugList[i].max_unit,drugList[i].min_unit,drugList[i].min_number)
+        drugList[i].supply_count = ""
+        drugList[i].supply_total_price = ""
+        drugList[i].supply_manufacturer=  drugList[i].manufacturer
+        drugList[i].supply_license_number= drugList[i].number
+        drugList[i].supply_remake = ""
+        drugList[i].type = 1
+        drugList[i].supply_price = drugList[i].last_price
+        drugList[i].name = drugList[i].drug_name
+        drugList[i].unitList = [{id:1,name:""},{id:2,name:""}]
+        drugList[i].supply_unit = drugList[i].max_unit 
+        for(let j=0;j<drugList[i].unitList.length;j++){
+           drugList[i].unitList[0].name = drugList[i].max_unit
+           drugList[i].unitList[1].name = drugList[i].min_unit
+        }
+        this.tabList.push(drugList[i])
+        }
+        this.drugList = drugList
+        var goodList =  response.data.data.goodList
+        for(let i=0;i<goodList.length;i++){
+        for(let j=0;j<this.manufactuerList.length;j++){
+            if(goodList[i].manufacturer == this.manufactuerList[j].id){
+                goodList[i].manufacturer = this.manufactuerList[j].manufacturer_name
+            }
+        }
+        for(let y=0;y<this.goodTypeList.length;y++){
+            if(goodList[i].good_type_id == this.goodTypeList[y].id){
+                goodList[i].good_type_id = this.goodTypeList[y].type_name
+            }
+        }
+        goodList[i].supply_name = goodList[i].good_name + " " + goodList[i].specification_name + " " +goodList[i].manufacturer
+        goodList[i].supply_type = goodList[i].good_type_id
+        goodList[i].supply_specification_name =goodList[i].specification_name
+        goodList[i].supply_price = goodList[i].buy_price
+        goodList[i].supply_total = this.getTotalStockCount(goodList[i].good_warehouse_info)
+        goodList[i].supply_count = ""
+        goodList[i].supply_total_price = ""
+        goodList[i].supply_manufacturer = goodList[i].manufacturer
+        goodList[i].supply_license_number = ""
+        goodList[i].supply_remake = ""
+        goodList[i].type = 2
+        goodList[i].name = goodList[i].good_name
+        goodList[i].unitList =  [{id:1,name:""},{id:2,name:""}]
+        goodList[i].supply_unit = goodList[i].packing_unit
+        for(let j=0;j<goodList[i].unitList.length;j++){
+           goodList[i].unitList[0].name = goodList[i].packing_unit 
+        }
+        this.tabList.push(goodList[i])
+        }
+        this.goodList = goodList
+    } 
+    })
+},
+changeGoodName(val){
+  this.currentIndex = val
+},
+changeName(val){
+    //var obj = {"id":0,"name":"合计","supply_name":"","supply_type":"","supply_specification_name":"","supply_total":"","supply_count":"","supply_price":"","supply_total_price":"","supply_manufacturer":"","supply_license_number":"","supply_remake":"","is_total":2}
+   for(let i=0;i<this.recordInfo.tableList.length;i++){
+    if(this.currentIndex == i){
+        this.recordInfo.tableList[i].project_id = val.id
+        this.recordInfo.tableList[i].type = val.type
+        this.recordInfo.tableList[i].name = val.name
+        this.recordInfo.tableList[i].supply_name = val.supply_name
+        this.recordInfo.tableList[i].supply_type = val.supply_type
+        this.recordInfo.tableList[i].supply_specification_name = val.supply_specification_name
+        this.recordInfo.tableList[i].supply_total = val.supply_total
+        if(val.supply_count == NaN){
+           this.recordInfo.tableList[i].supply_count = ""
+        }else{
+          this.recordInfo.tableList[i].supply_count = val.supply_count?val.supply_count:""
+        }
+
+        this.recordInfo.tableList[i].supply_price = val.supply_price?val.supply_price:""
+        this.recordInfo.tableList[i].supply_total_price = val.supply_total_price?val.supply_total_price:""
+        this.recordInfo.tableList[i].supply_manufacturer = val.supply_manufacturer
+        this.recordInfo.tableList[i].supply_license_number = val.supply_license_number
+        this.recordInfo.tableList[i].supply_remake = val.supply_remake
+        this.recordInfo.tableList[i].is_total = val.is_total
+        this.recordInfo.tableList[i].supply_unit = val.supply_unit
+        this.recordInfo.tableList[i].unitList = val.unitList
+     }
+    }
+   
+
+},
+handleEdit(){
+    const tempObj = {}
+    tempObj["id"] = 0
+    tempObj["name"] = ""
+    tempObj['supply_name'] = ""
+    tempObj['supply_type'] = ""
+    tempObj['supply_specification_name'] = ''
+    tempObj['supply_total'] = ""
+    tempObj['supply_count'] = ""
+    tempObj['supply_price'] = ""
+    tempObj['supply_total_price'] = ""
+    tempObj['supply_manufacturer'] = ''
+    tempObj['supply_license_number'] = ''
+    tempObj['supply_remake'] = ''
+    tempObj['type'] = 0
+    tempObj['is_total'] = 1
+    tempObj["project_id"] = 0
+    tempObj["supply_unit"] = ""
+    this.recordInfo.tableList.push(tempObj)
+},
+handleDelete: function(index, row) {
+  if (this.recordInfo.tableList.length <= 1) {
+        this.$message.error('只有一条记录的时候无法删除')
+        return
+   } else {
+        this.recordInfo.tableList.splice(index, 1)
+   }
+},
+
+changeTypeName(){
+
+},
+startTimeChange(){
+
+},
+endTimeChange(){
+
+},
+search(){
+
+},
+
+getWarehoseInfo(arr,max_unit,min_unit,min_number){
+    var total = 0
+    var max_str=  ""
+    var min_str = ""
+    if (arr.length > 0) {
+      for(let i=0;i<arr.length;i++){
+        total += parseInt(arr[i].stock_max_number)
+      }
+    }
+    if (total < min_number){
+        min_str = total + min_unit
+    }
+    if (total == 0) {
+        min_str = ""
+        max_str = ""
+    }
+   if (total >=min_number) {
+    if(parseInt(total/min_number)!=0){
+        max_str = parseInt(total/min_number) + max_unit
+    }
+    if(total%min_number!=0){
+       min_str = total%min_number + min_unit
+    }
+  }
+ return max_str + min_str
+ },
+getTotalStockCount(arr){
+  var total_count = 0
+  for(let i=0;i<arr.length;i++){
+    total_count += arr[i].stock_count
+  }
+  return total_count
+},
+calculate: function(val) {
+    if (isNaN(val)) {
+        return "";
+    }
+    if (val == 0) {
+        return "";
+    }
+    return Math.round(parseFloat(val) * 100) / 100;
+  },
+getTimes(time) {
+    if (time === '') {
+    return ''
+    }
+    return uParseTime(time, '{y}-{m}-{d}')
+},
+ updatePurchaseOrder(){
+   this.loading = true 
+    if(this.supplier_name == 0 || this.supplier_name == ""){
+        this.$message.error("供应商不能为空!")
+        this.loading = false
+        return false
+    }
+   this.$refs["tableForm"].validate((valid)=>{
+      if(valid){
+        for(let i=0;i<this.recordInfo.tableList.length;i++){
+           this.recordInfo.tableList[i].supply_count = parseInt(this.recordInfo.tableList[i].supply_count)
+           this.recordInfo.tableList[i].supply_license_number = this.recordInfo.tableList[i].supply_license_number.toString()
+           this.recordInfo.tableList[i].supply_total_price = (this.recordInfo.tableList[i].supply_count * this.recordInfo.tableList[i].supply_price).toString()
+           this.recordInfo.tableList[i].supply_total = this.recordInfo.tableList[i].supply_total.toString()
+            this.recordInfo.tableList[i].supply_price = this.recordInfo.tableList[i].supply_price.toString()
+           for(let j=0;j<this.manufactuerList.length;j++){
+              if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].manufacturer_name){
+                this.recordInfo.tableList[i].manufacturer_id = this.manufactuerList[j].id
+              }
+           }
+        }
+        var start = this.getTimes(this.start_time)
+        var end = this.getTimes(this.end_time)
+        const params = {
+        'stockIn': this.recordInfo.tableList
+        }
+        console.log("param23232332",params)  
+       
+        updatePurchaseOrder(params,this.supplier_name,start,end,this.rate_of_concession,this.discount_amount,this.id,this.number).then(response=>{
+           if(response.data.state == 1){
+            this.loading = false
+             var warehousingInfo =  response.data.data.warehousingInfo
+             this.$message.success("修改成功!")
+           }
+        })
+      } 
+   })
+ },
+ getAllPrice(){
+   var total_price = 0
+   for(let i=0;i<this.recordInfo.tableList.length;i++){
+      total_price += (this.recordInfo.tableList[i].supply_price * this.recordInfo.tableList[i].supply_count)
+   }  
+   return total_price.toFixed(2)
+ },
+ checkPurchaseOrder(id,index){
+   this.$confirm('是否审核?', {
+    confirmButtonText: '确 定',
+    cancelButtonText: '取 消',
+    type: 'warning'
+    }).then(() => { 
+    checkPurchaseOrder(this.id).then(response => {
+        if (response.data.state == 1) {
+          var info = response.data.data.info
+          this.disabled = true
+          this.$message.success("审核成功!")
+          this.getPurchaseOrderDetail()
+        } 
+     })
+    })
+    .catch(() => {
+    }) 
+  },
+  getPurchaseOrderDetail(){
+      console.log("处方233223232323322323232323")
+      var id = this.$route.query.id
+    getPurchaseOrderDetail(id).then(response=>{
+      if(response.data.state == 1){
+        var info = response.data.data.info
+        this.is_check = info.is_check
+        this.number = info.number
+        this.id = info.id
+        this.supplier_name = info.supplier_id
+        this.rate_of_concession = info.rate_of_concession
+        this.discount_amount = info.discount_amount
+        var orderInfo = response.data.data.orderInfo
+        if(info.is_check == 2){
+           this.disabled = false
+        }
+        if(info.is_check == 1){
+           this.disabled = true
+        }
+        console.log("drugli323322332",this.drugList)
+        var drugList = response.data.data.baseList
+        var goodList = response.data.data.goodList
+        for(let i=0;i<orderInfo.length;i++){
+            orderInfo[i].supply_count = orderInfo[i].count
+            orderInfo[i].supply_price = orderInfo[i].price
+            orderInfo[i].supply_remake = orderInfo[i].remark
+            orderInfo[i].type = orderInfo[i].is_source
+            orderInfo[i].project_id = orderInfo[i].project_id
+            orderInfo[i].supply_unit = orderInfo[i].supply_unit
+           if(orderInfo[i].is_source == 1){
+            for(let j=0;j<drugList.length;j++){
+                if(orderInfo[i].project_id == drugList[j].id){
+                  orderInfo[i].unitList = [{id:1,name:""},{id:2,name:""}]
+                  orderInfo[i].unitList[0].name = drugList[j].max_unit
+                  orderInfo[i].unitList[1].name = drugList[j].min_unit
+                }
+             }  
+            } 
+          if(orderInfo[i].is_source == 2){
+            for(let j=0;j<goodList.length;j++){
+                if(orderInfo[i].project_id == goodList[j].id){
+                    orderInfo[i].unitList = [{id:1,name:""}]
+                    orderInfo[i].unitList[0].name = goodList[j].packing_unit
+                }
+            }  
+          } 
+        }
+        console.log("orderINFO23323232",orderInfo)
+        this.recordInfo.tableList = orderInfo
+      }
+    })  
+  },
+  toPrint(){
+     var id = this.$route.query.id
+     this.$router.push({path:"/purchase/order/print?&id="+id})  
+  },
+  toAdd(){
+    var id = this.$route.query.id
+    if(this.is_check == 2){
+      this.$message.error("该采购订单未审核,不能生成采购数据!")
+      return false
+    }
+    this.$router.push({path:"/purchase/order/add?id="+id})
+  }
+},
+created(){
+    const tempObj = {}
+    tempObj["id"] = 0
+    tempObj["name"] = ""
+    tempObj['supply_name'] = ""
+    tempObj['supply_type'] = ""
+    tempObj['supply_specification_name'] = ''
+    tempObj['supply_total'] = ""
+    tempObj['supply_count'] = ""
+    tempObj['supply_price'] = ""
+    tempObj['supply_total_price'] = ""
+    tempObj['supply_manufacturer'] = ''
+    tempObj['supply_license_number'] = ''
+    tempObj['supply_remake'] = ''
+    tempObj['type'] = 0
+    tempObj['is_total'] = 1
+    tempObj["project_id"] = 0
+    tempObj["supply_unit"] = ""
+    this.recordInfo.tableList.push(tempObj)
+    this.getInitOrder()
+    this.getPurchaseOrderDetail()
+}
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+border: 1px #dcdfe6 solid;
+padding: 30px 20px 30px 20px;
+
+.border {
+border-bottom: 1px #dcdfe6 solid;
+margin: 0px 0 20px 0;
+}
+}
+
+.title {
+background: #409eff;
+height: 44px;
+line-height: 44px;
+padding: 0 0 0 10px;
+color: #fff;
+margin: 0 0 10px 0;
+}
+
+.edit_separater {
+border-top: 1px solid rgb(233, 233, 233);
+margin-top: 15px;
+margin-bottom: 15px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+background: #6fb5fa;
+}
+
+.count {
+color: #bd2c00;
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+background-color: #d0d3da;
+}
+.el-table__fixed-right{
+  width:150px;
+  bottom: 20px;
+  height: 100%;
+}
+</style>

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -49,8 +49,8 @@
     </div>
     <div>
         <el-button size="small" type="primary" @click="savePurchaseOrder" v-show="showTwo">保存</el-button>
-        <el-button size="small" type="primary" @click="updatePurchaseOrder" v-show="showOne">打印</el-button>
-        <el-button size="small" type="primary" @click="updatePurchaseOrder" v-show="showOne">审核</el-button>
+        <el-button size="small" type="primary" @click="toPrint()" v-show="showOne">打印</el-button>
+        <el-button size="small" type="primary" @click="checkPurchaseOrder" v-show="showOne">审核</el-button>
         <el-button size="small" type="primary" @click="updatePurchaseOrder" v-show="showOne">修改</el-button>
     </div>
     </div>
@@ -74,7 +74,7 @@
         </template>
         <template slot-scope="scope">
            <el-form-item :prop="'tableList.' + scope.$index + '.name'" :rules='tableRules.name'>
-            <el-select v-model="scope.row.name" style="width:160px;" filterable placeholder="请选择" @change="changeName"   @input="changeGoodName(scope.$index)">
+            <el-select v-model="scope.row.name" style="width:160px;" filterable placeholder="请选择" @change="changeName"   @input="changeGoodName(scope.$index)" :disabled="disabled">
                 <el-option
                     v-for="(item,index) in tabList"
                     :key="index"
@@ -97,7 +97,24 @@
         <template slot-scope="scope">
             <el-input v-model="scope.row.supply_specification_name" style="width:150px" :disabled="true"></el-input>
         </template>
-        </el-table-column>
+    </el-table-column>
+     <el-table-column label="单位" align="center" width="120px">
+        <template slot="header" slot-scope="scope">
+            <span>单位<span style="color: red">*</span></span>
+        </template>
+        <template slot-scope="scope">
+          <el-form-item :prop="'tableList.' + scope.$index + '.supply_unit'" :rules='tableRules.supply_unit'>
+            <el-select v-model="scope.row.supply_unit" style="width:100px;" filterable placeholder="请选择"  :disabled="disabled">
+                    <el-option
+                        v-for="(item,index) in scope.row.unitList"
+                        :key="index"
+                        :label="item.name"
+                        :value="item.name">
+                    </el-option>
+             </el-select>
+          </el-form-item>  
+        </template>
+    </el-table-column>
     <el-table-column label="可用库存" align="center" width="130px">
         <template slot-scope="scope">
             <el-input v-model="scope.row.supply_total" style="width:100px" :disabled="true"></el-input>
@@ -109,14 +126,16 @@
         </template>
         <template slot-scope="scope">
           <el-form-item  :prop="'tableList.' + scope.$index + '.supply_count'" :rules='tableRules.supply_count'>
-             <el-input v-model="scope.row.supply_count" style="width:80px"></el-input>
+             <el-input v-model="scope.row.supply_count" style="width:80px" :disabled="disabled"></el-input>
           </el-form-item>
         </template>
     </el-table-column>
 
+   
+
     <el-table-column label="购货单价" align="center" width="120px">
         <template slot-scope="scope">
-        <el-input v-model="scope.row.supply_price" style="width:80px"></el-input>
+        <el-input v-model="scope.row.supply_price" style="width:80px" :disabled="disabled"></el-input>
         </template>
     </el-table-column>
 
@@ -135,13 +154,13 @@
 
     <el-table-column label="批准文号" align="center" width="200px">
         <template slot-scope="scope">
-        <el-input v-model="scope.row.supply_license_number" style="width:160px"></el-input>
+        <el-input v-model="scope.row.supply_license_number" style="width:160px" :disabled="disabled"></el-input>
         </template>
     </el-table-column>
 
     <el-table-column label="备注" align="center" width="200px">
         <template slot-scope="scope">
-        <el-input v-model="scope.row.supply_remake" style="width:160px"></el-input>
+        <el-input v-model="scope.row.supply_remake" style="width:160px" :disabled="disabled"></el-input>
         </template>
     </el-table-column>
 
@@ -184,7 +203,8 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import {uParseTime } from '@/utils/tools'
-import {getInitOrder,savePurchaseOrder,updatePurchaseOrder} from "@/api/supply"
+import {getInitOrder,savePurchaseOrder,updatePurchaseOrder,checkPurchaseOrder} from "@/api/supply"
+import {getDataConfig } from '@/utils/data'
 export default {
 name: "addPurchaseOrder",
 created() {
@@ -246,6 +266,7 @@ return {
     tableRules: {
      name: [{ required: true, message: '商品不能为空', trigger: 'blur' }],
      supply_count: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
+     supply_unit:[{required:true,message: '单位不能为空', trigger: 'blur'}]
    },
    warehousing_id:0,
    number:"",
@@ -253,6 +274,14 @@ return {
    drugList:[],
    goodList:[],
    id:0,
+   disabled:false,
+   unitList:[
+     {id:1,name:""},
+     {id:2,name:""}
+   ],
+   goodList:[
+     {id:1,name:""},
+   ],
   };
 },
 methods:{
@@ -261,11 +290,13 @@ getInitOrder(){
     getInitOrder().then(response=>{
     if(response.data.state == 1){
         var drugList = response.data.data.drugList
+        
         this.manufactuerList = response.data.data.manufactuerList
         this.goodTypeList = response.data.data.goodTypeList
         this.drugTypeList = response.data.data.drugTypeList
         this.supplyList = response.data.data.supplyList
        for(let i=0;i<drugList.length;i++){
+          
           for(let z=0;z<drugList[i].drug_warehouse_info.length;z++){
             drugList[i].drug_warehouse_info[z].stock_max_number = drugList[i].drug_warehouse_info[z].stock_max_number * drugList[i].min_number
           }
@@ -289,14 +320,21 @@ getInitOrder(){
         drugList[i].supply_license_number= drugList[i].number
         drugList[i].supply_remake = ""
         drugList[i].type = 1
-        drugList[i].supply_price = ""
+        drugList[i].supply_price = drugList[i].last_price
         drugList[i].name = drugList[i].drug_name
-
+        drugList[i].supply_unit = drugList[i].max_unit
+        drugList[i].unitList = [{id:1,name:""},{id:2,name:""}]
+        for(let j=0;j<drugList[i].unitList.length;j++){
+           drugList[i].unitList[0].name = drugList[i].max_unit
+           drugList[i].unitList[1].name = drugList[i].min_unit
+        }
         this.tabList.push(drugList[i])
         }
         this.drugList = drugList
         var goodList =  response.data.data.goodList
+       
         for(let i=0;i<goodList.length;i++){
+       
         for(let j=0;j<this.manufactuerList.length;j++){
             if(goodList[i].manufacturer == this.manufactuerList[j].id){
                 goodList[i].manufacturer = this.manufactuerList[j].manufacturer_name
@@ -310,7 +348,7 @@ getInitOrder(){
         goodList[i].supply_name = goodList[i].good_name + " " + goodList[i].specification_name + " " +goodList[i].manufacturer
         goodList[i].supply_type = goodList[i].good_type_id
         goodList[i].supply_specification_name =goodList[i].specification_name
-        goodList[i].supply_price = ""
+        goodList[i].supply_price = goodList[i].buy_price
         goodList[i].supply_total = this.getTotalStockCount(goodList[i].good_warehouse_info)
         goodList[i].supply_count = ""
         goodList[i].supply_total_price = ""
@@ -319,7 +357,11 @@ getInitOrder(){
         goodList[i].supply_remake = ""
         goodList[i].type = 2
         goodList[i].name = goodList[i].good_name
-
+        goodList[i].supply_unit = goodList[i].packing_unit
+        goodList[i].unitList =  [{id:1,name:""},{id:2,name:""}]
+        for(let j=0;j<goodList[i].unitList.length;j++){
+           goodList[i].unitList[0].name = goodList[i].packing_unit 
+        }
         this.tabList.push(goodList[i])
         }
         this.goodList = goodList
@@ -330,16 +372,17 @@ changeGoodName(val){
   this.currentIndex = val
 },
 changeName(val){
-    //var obj = {"id":0,"name":"合计","supply_name":"","supply_type":"","supply_specification_name":"","supply_total":"","supply_count":"","supply_price":"","supply_total_price":"","supply_manufacturer":"","supply_license_number":"","supply_remake":"","is_total":2}
+   console.log("val3233232322332",val)
    for(let i=0;i<this.recordInfo.tableList.length;i++){
     if(this.currentIndex == i){
-        this.recordInfo.tableList[i].id = val.id
+        this.recordInfo.tableList[i].project_id = val.id
         this.recordInfo.tableList[i].type = val.type
         this.recordInfo.tableList[i].name = val.name
         this.recordInfo.tableList[i].supply_name = val.supply_name
         this.recordInfo.tableList[i].supply_type = val.supply_type
         this.recordInfo.tableList[i].supply_specification_name = val.supply_specification_name
         this.recordInfo.tableList[i].supply_total = val.supply_total
+        
         if(val.supply_count == NaN){
            this.recordInfo.tableList[i].supply_count = ""
         }else{
@@ -352,6 +395,8 @@ changeName(val){
         this.recordInfo.tableList[i].supply_license_number = val.supply_license_number
         this.recordInfo.tableList[i].supply_remake = val.supply_remake
         this.recordInfo.tableList[i].is_total = val.is_total
+        this.recordInfo.tableList[i].supply_unit = val.supply_unit
+        this.recordInfo.tableList[i].unitList = val.unitList
      }
     }
    
@@ -359,7 +404,7 @@ changeName(val){
 },
 handleEdit(){
     const tempObj = {}
-    tempObj["id"] = ""
+    tempObj["id"] = 0
     tempObj["name"] = ""
     tempObj['supply_name'] = ""
     tempObj['supply_type'] = ""
@@ -373,6 +418,8 @@ handleEdit(){
     tempObj['supply_remake'] = ''
     tempObj['type'] = 0
     tempObj['is_total'] = 1
+    tempObj["project_id"] = 0
+    tempObj["supply_unit"] = ""
     this.recordInfo.tableList.push(tempObj)
 },
 handleDelete: function(index, row) {
@@ -389,6 +436,7 @@ savePurchaseOrder(){
     this.loading = true
     if(this.supplier_name == 0 || this.supplier_name == ""){
        this.$message.error("供应商不能为空!")
+       this.loading = false
        return false
     }
     this.$refs["tableForm"].validate((valid)=>{
@@ -397,6 +445,8 @@ savePurchaseOrder(){
             this.recordInfo.tableList[i].supply_count = parseInt(this.recordInfo.tableList[i].supply_count)
             this.recordInfo.tableList[i].supply_license_number = this.recordInfo.tableList[i].supply_license_number.toString()
             this.recordInfo.tableList[i].supply_total_price = (this.recordInfo.tableList[i].supply_count * this.recordInfo.tableList[i].supply_price).toString()
+            this.recordInfo.tableList[i].supply_total = this.recordInfo.tableList[i].supply_total.toString()
+            this.recordInfo.tableList[i].supply_price = this.recordInfo.tableList[i].supply_price.toString()
             for(let j=0;j<this.manufactuerList.length;j++){
                 if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].manufacturer_name){
                 this.recordInfo.tableList[i].manufacturer_id = this.manufactuerList[j].id
@@ -421,9 +471,29 @@ savePurchaseOrder(){
                 this.recordInfo.tableList = []
                 var orderInfo = response.data.data.orderInfo
                 for(let i=0;i<orderInfo.length;i++){
+                   if(orderInfo[i].is_source == 1){
+                    for(let j=0;j<this.drugList.length;j++){
+                       if(orderInfo[i].project_id == this.drugList[j].id){
+                          orderInfo[i].unitList = [{id:1,name:""},{id:2,name:""}]
+                          orderInfo[i].unitList[0].name = this.drugList[j].max_unit
+                          orderInfo[i].unitList[1].name = this.drugList[j].min_unit
+                       }
+                    }  
+                   } 
+                  if(orderInfo[i].is_source == 2){
+                    for(let j=0;j<this.goodList.length;j++){
+                       if(orderInfo[i].project_id == this.goodList[j].id){
+                          orderInfo[i].unitList = [{id:1,name:""}]
+                          orderInfo[i].unitList[0].name = this.goodList[j].packing_unit
+                       }
+                    }  
+                   } 
                   orderInfo[i].supply_count = orderInfo[i].count
                   orderInfo[i].supply_price = orderInfo[i].price
                   orderInfo[i].supply_remake = orderInfo[i].remark
+                  orderInfo[i].type = orderInfo[i].is_source
+                  orderInfo[i].project_id = orderInfo[i].project_id
+                  orderInfo[i].supply_unit = orderInfo[i].supply_unit
                 }
                 console.log("orderINFO23323232",orderInfo)
                 this.recordInfo.tableList = orderInfo
@@ -519,12 +589,20 @@ getTimes(time) {
     return uParseTime(time, '{y}-{m}-{d}')
 },
  updatePurchaseOrder(){
-   this.$refs.validate((valid)=>{
+   this.loading = true 
+    if(this.supplier_name == 0 || this.supplier_name == ""){
+        this.$message.error("供应商不能为空!")
+        this.loading = false
+        return false
+    }
+   this.$refs["tableForm"].validate((valid)=>{
       if(valid){
         for(let i=0;i<this.recordInfo.tableList.length;i++){
            this.recordInfo.tableList[i].supply_count = parseInt(this.recordInfo.tableList[i].supply_count)
            this.recordInfo.tableList[i].supply_license_number = this.recordInfo.tableList[i].supply_license_number.toString()
            this.recordInfo.tableList[i].supply_total_price = (this.recordInfo.tableList[i].supply_count * this.recordInfo.tableList[i].supply_price).toString()
+           this.recordInfo.tableList[i].supply_total = this.recordInfo.tableList[i].supply_total.toString()
+            this.recordInfo.tableList[i].supply_price = this.recordInfo.tableList[i].supply_price.toString()
            for(let j=0;j<this.manufactuerList.length;j++){
               if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].manufacturer_name){
                 this.recordInfo.tableList[i].manufacturer_id = this.manufactuerList[j].id
@@ -533,11 +611,14 @@ getTimes(time) {
         }
         var start = this.getTimes(this.start_time)
         var end = this.getTimes(this.end_time)
-         const params = {
-            'stockIn': this.recordInfo.tableList
-         }
+        const params = {
+        'stockIn': this.recordInfo.tableList
+        }
+        console.log("params23232233223",params)
+        
         updatePurchaseOrder(params,this.supplier_name,start,end,this.rate_of_concession,this.discount_amount,this.id,this.number).then(response=>{
            if(response.data.state == 1){
+            this.loading = false
              var warehousingInfo =  response.data.data.warehousingInfo
              this.$message.success("修改成功!")
            }
@@ -546,17 +627,41 @@ getTimes(time) {
    })
  },
  getAllPrice(){
-   console.log("表哥2332323223323223",this.recordInfo.tableList)  
    var total_price = 0
    for(let i=0;i<this.recordInfo.tableList.length;i++){
       total_price += (this.recordInfo.tableList[i].supply_price * this.recordInfo.tableList[i].supply_count)
    }  
    return total_price.toFixed(2)
- }
+ },
+ checkPurchaseOrder(id,index){
+   this.$confirm('是否审核?', {
+    confirmButtonText: '确 定',
+    cancelButtonText: '取 消',
+    type: 'warning'
+    }).then(() => {
+    console.log("id232233232323223",this.id)    
+    checkPurchaseOrder(this.id).then(response => {
+        if (response.data.state == 1) {
+          var info = response.data.data.info
+          this.disabled = true
+          this.$message.success("审核成功!")
+        } 
+     })
+    })
+    .catch(() => {
+    }) 
+  },
+  toPrint(){
+     var id = this.id
+     this.$router.push({path:"/purchase/order/print?&id="+id})  
+  },
+  getDataConfig(module, filed_name){
+    return getDataConfig(module, filed_name)
+  },
 },
 created(){
     const tempObj = {}
-    tempObj["id"] = ""
+    tempObj["id"] = 0
     tempObj["name"] = ""
     tempObj['supply_name'] = ""
     tempObj['supply_type'] = ""
@@ -570,6 +675,8 @@ created(){
     tempObj['supply_remake'] = ''
     tempObj['type'] = 0
     tempObj['is_total'] = 1
+    tempObj["project_id"] = 0
+    tempObj["supply_unit"] = ""
     this.recordInfo.tableList.push(tempObj)
     this.getInitOrder()
 }
@@ -629,6 +736,6 @@ background-color: #d0d3da;
 .el-table__fixed-right{
   width:150px;
   bottom: 20px;
-  height: 200px;
+  height: 100%;
 }
 </style>

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -0,0 +1,710 @@
+<template>
+<div class="main-contain">
+<div class="position">
+    <bread-crumb :crumbs="crumbs"></bread-crumb>
+</div>
+<div class="app-container"  v-loading="loading">
+    <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
+    <div>
+        <span style="color:red">*</span><span>供应商:</span>
+        <el-select v-model="supplier_name" style="width:140px;margin-right:10px;" placeholder="请选择"
+        @change="changeTypeName">
+        <el-option
+            v-for="item in supplyList"
+            :key="item.id"
+            :label="item.supplier_name"
+            :value="item.id">
+        </el-option>
+        </el-select>
+        <span>单据日期:</span>
+        <el-date-picker
+        size="small"
+        v-model="start_time"
+        prefix-icon="el-icon-date"
+        :editable="false"
+        style="width: 196px;"
+        type="date"
+        placeholder="选择日期时间"
+        align="right"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
+        @change="startTimeChange"
+        ></el-date-picker>
+        <span>交货日期:</span>
+        <el-date-picker
+            size="small"
+            v-model="end_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="endTimeChange"
+        ></el-date-picker>
+        <span>单据编码:{{number}}</span>
+
+    </div>
+    <div>
+        <el-button size="small" type="primary" @click="toAdd">生成购货单</el-button>
+        <el-button size="small" type="primary" @click="updatePurchaseOrder">修改</el-button>
+        <el-button size="small" type="primary" @click="toPrint">打印</el-button>
+        <el-button size="small" type="primary" v-if="is_check == 2" @click="checkPurchaseOrder">审核</el-button>
+        <el-button size="small" type="primary" v-if="is_check == 1" @click="checkPurchaseOrder">反审核</el-button>
+       
+    </div>
+    </div>
+
+   <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
+    <el-table
+    :row-style="{ color: '#303133' }"
+    :header-cell-style="{
+        backgroundColor: 'rgb(245, 247, 250)',
+        color: '#606266'
+    }"
+    :data="recordInfo.tableList"
+    :class="signAndWeighBoxPatients"
+    border
+    style="width: 100%"
+    max-height="450"
+    >
+    <el-table-column align="center" width="200px">
+        <template slot="header" slot-scope="scope">
+            <span>商品<span style="color: red">*</span></span>
+        </template>
+        <template slot-scope="scope">
+           <el-form-item :prop="'tableList.' + scope.$index + '.name'" :rules='tableRules.name'>
+            <el-select v-model="scope.row.name" style="width:160px;" filterable placeholder="请选择" @change="changeName"   @input="changeGoodName(scope.$index)" :disabled="disabled">
+                <el-option
+                    v-for="(item,index) in tabList"
+                    :key="index"
+                    :label="item.supply_name"
+                    :value="item">
+                </el-option>
+             </el-select>
+           </el-form-item>
+        </template>
+    </el-table-column>
+    <el-table-column  align="center" width="150px">
+        <template slot="header" slot-scope="scope">
+            <span>商品类别</span>
+        </template>
+        <template slot-scope="scope">
+            <el-input v-model="scope.row.supply_type" style="width:120px" :disabled="true"></el-input>
+        </template>
+    </el-table-column>
+    <el-table-column label="规格&单位" align="center" width="200px">
+        <template slot-scope="scope">
+            <el-input v-model="scope.row.supply_specification_name" style="width:150px" :disabled="true"></el-input>
+        </template>
+    </el-table-column>
+     <el-table-column label="单位" align="center" width="120px">
+        <template slot="header" slot-scope="scope">
+            <span>单位<span style="color: red">*</span></span>
+        </template>
+        <template slot-scope="scope">
+          <el-form-item :prop="'tableList.' + scope.$index + '.supply_unit'" :rules='tableRules.supply_unit'>
+            <el-select v-model="scope.row.supply_unit" style="width:100px;" filterable placeholder="请选择"  :disabled="disabled">
+                    <el-option
+                        v-for="(item,index) in scope.row.unitList"
+                        :key="index"
+                        :label="item.name"
+                        :value="item.name">
+                    </el-option>
+             </el-select>
+          </el-form-item>  
+        </template>
+    </el-table-column>
+    <el-table-column label="批号" align="center" width="130px">
+        <template slot-scope="scope">
+            <el-input v-model="scope.row.supply_total" style="width:100px" :disabled="true"></el-input>
+        </template>
+    </el-table-column>
+    <el-table-column label="有效日期" align="center" width="130px">
+        <template slot-scope="scope">
+            <el-input v-model="scope.row.supply_total" style="width:100px" :disabled="true"></el-input>
+        </template>
+    </el-table-column>
+    <el-table-column label="可用库存" align="center" width="130px">
+        <template slot-scope="scope">
+            <el-input v-model="scope.row.supply_total" style="width:100px" :disabled="true"></el-input>
+        </template>
+    </el-table-column>
+    <el-table-column label="数量" align="center" width="120px">
+        <template slot="header" slot-scope="scope">
+            <span>数量<span style="color: red">*</span></span>
+        </template>
+        <template slot-scope="scope">
+          <el-form-item  :prop="'tableList.' + scope.$index + '.supply_count'" :rules='tableRules.supply_count'>
+             <el-input v-model="scope.row.supply_count" style="width:80px" :disabled="disabled"></el-input>
+          </el-form-item>
+        </template>
+    </el-table-column>
+
+    <el-table-column label="购货单价" align="center" width="120px">
+        <template slot-scope="scope">
+        <el-input v-model="scope.row.supply_price" style="width:80px" :disabled="disabled"></el-input>
+        </template>
+    </el-table-column>
+
+    <el-table-column label="购货金额" align="center" width="120px">
+        <template slot-scope="scope">
+          {{calculate(scope.row.supply_count * scope.row.supply_price)}}
+        </template>
+    </el-table-column>
+
+    <el-table-column label="生产日期" align="center" width="200px">
+        <template slot-scope="scope">
+        <el-input v-model="scope.row.supply_manufacturer" style="width:160px" :disabled="true"></el-input>
+        </template>
+    </el-table-column>
+    <el-table-column label="生产厂家" align="center" width="200px">
+        <template slot-scope="scope">
+        <el-input v-model="scope.row.supply_manufacturer" style="width:160px" :disabled="true"></el-input>
+        </template>
+    </el-table-column>
+
+
+    <el-table-column label="批准文号" align="center" width="200px">
+        <template slot-scope="scope">
+        <el-input v-model="scope.row.supply_license_number" style="width:160px" :disabled="disabled"></el-input>
+        </template>
+    </el-table-column>
+    <el-table-column label="关联采购订单号" align="center" width="200px">
+        <template slot-scope="scope">
+        <el-input v-model="scope.row.supply_remake" style="width:160px" :disabled="disabled"></el-input>
+        </template>
+    </el-table-column>
+    <el-table-column label="备注" align="center" width="200px">
+        <template slot-scope="scope">
+        <el-input v-model="scope.row.supply_remake" style="width:160px" :disabled="disabled"></el-input>
+        </template>
+    </el-table-column>
+
+    <el-table-column label="操作" align="center" width="150px" fixed="right" >
+        <template slot-scope="scope">
+        <el-tooltip class="item" effect="dark" content="新增" placement="top" >
+            <el-button
+                size="mini"
+                type="primary"
+                icon="el-icon-circle-plus-outline"
+                @click="handleEdit(scope.$index, scope.row)">
+            </el-button>
+       </el-tooltip>
+       <el-tooltip class="item" effect="dark" content="删除" placement="top">
+            <el-button
+                size="mini"
+                type="danger"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.$index, scope.row)">
+            </el-button>
+        </el-tooltip>
+
+        </template>
+    </el-table-column>
+  </el-table>
+</el-form>
+   <div style="margin-top:10px">
+      合计:{{getAllPrice()}} 元
+   </div>
+   <div style="margin-top:10px">
+        <span>优惠率:<el-input style="width:100px" v-model="rate_of_concession"></el-input>%</span>
+
+        <span>优惠金额:<el-input style="width:100px" v-model="discount_amount"></el-input></span>
+
+        <span>本次付款:<el-input style="width:100px" v-model="discount_amount"></el-input></span>
+
+        <span>本次欠款:<el-input style="width:100px" v-model="discount_amount"></el-input></span>
+
+    </div>
+</div>
+
+  <!-- <el-dialog
+  title="提示"
+  :visible.sync="dialogVisible"
+  width="30%"
+  :before-close="handleClose">
+  <span>这是一段信息</span>
+  <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+  </span>
+  </el-dialog> -->
+</div>
+</template>
+
+<script>
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import {uParseTime } from '@/utils/tools'
+import {getInitOrder,updatePurchaseOrder,checkPurchaseOrder,getPurchaseOrderDetail} from "@/api/supply"
+export default {
+name: "addPurchaseOrder",
+components: {
+BreadCrumb
+},
+data() {
+return {
+    crumbs: [
+       { path: false, name: "购货订单" },
+       { path: "/spply/query", name: "编辑购货订单" }
+    ],
+    showTwo:true,
+    showOne:false,
+    recordInfo: {
+      tableList:[],
+    },
+    keywords: "",
+    total: 0,
+    multipleSelection: [],
+    signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+    start_time: "",
+    end_time: "",
+    page: 1,
+    limit: 10,
+    goodType: [],
+    goodInfo: [],
+    org_id:0,
+    types:[],
+    tyep_name:"",
+    form:{
+    manufacturer_id:"",
+    },
+    tabList:[],
+    manufactuerList:[],
+    currentIndex: 0,
+    goodTypeList:[],
+    drugTypeList:[],
+    supplier_name:"",
+    supplyList:[],
+    rate_of_concession:"",
+    discount_amount:"",
+    start_time:new Date(),
+    end_time:new Date(),
+    tableRules: {
+     name: [{ required: true, message: '商品不能为空', trigger: 'blur' }],
+     supply_count: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
+   },
+   warehousing_id:0,
+   number:"",
+   loading:false,
+   drugList:[],
+   goodList:[],
+   id:0,
+   disabled:false,
+   is_check:0,
+   dialogVisible:false,
+  };
+},
+methods:{
+
+getInitOrder(){
+    getInitOrder().then(response=>{
+    if(response.data.state == 1){
+        var drugList = response.data.data.drugList
+        this.manufactuerList = response.data.data.manufactuerList
+        this.goodTypeList = response.data.data.goodTypeList
+        this.drugTypeList = response.data.data.drugTypeList
+        this.supplyList = response.data.data.supplyList
+       for(let i=0;i<drugList.length;i++){
+          for(let z=0;z<drugList[i].drug_warehouse_info.length;z++){
+            drugList[i].drug_warehouse_info[z].stock_max_number = drugList[i].drug_warehouse_info[z].stock_max_number * drugList[i].min_number
+          }
+        for(let j=0;j<this.manufactuerList.length;j++){
+            if(drugList[i].manufacturer == this.manufactuerList[j].id){
+                drugList[i].manufacturer = this.manufactuerList[j].manufacturer_name
+            }
+        }
+        for(let y=0;y<this.drugTypeList.length;y++){
+            if(drugList[i].drug_type == this.drugTypeList[y].value){
+            drugList[i].drug_type = this.drugTypeList[y].name
+            }
+        }
+        drugList[i].supply_name =  drugList[i].drug_name + " " + drugList[i].dose +drugList[i].dose_unit+"*"+drugList[i].min_number+ drugList[i].min_unit+"/"+drugList[i].max_unit + " " + drugList[i].manufacturer
+        drugList[i].supply_type = drugList[i].drug_type
+        drugList[i].supply_specification_name = drugList[i].dose +drugList[i].dose_unit+"*"+drugList[i].min_number+ drugList[i].min_unit+"/"+drugList[i].max_unit
+        drugList[i].supply_total = this.getWarehoseInfo(drugList[i].drug_warehouse_info,drugList[i].max_unit,drugList[i].min_unit,drugList[i].min_number)
+        drugList[i].supply_count = ""
+        drugList[i].supply_total_price = ""
+        drugList[i].supply_manufacturer=  drugList[i].manufacturer
+        drugList[i].supply_license_number= drugList[i].number
+        drugList[i].supply_remake = ""
+        drugList[i].type = 1
+        drugList[i].supply_price = drugList[i].last_price
+        drugList[i].name = drugList[i].drug_name
+        drugList[i].unitList = [{id:1,name:""},{id:2,name:""}]
+        drugList[i].supply_unit = drugList[i].max_unit 
+        for(let j=0;j<drugList[i].unitList.length;j++){
+           drugList[i].unitList[0].name = drugList[i].max_unit
+           drugList[i].unitList[1].name = drugList[i].min_unit
+        }
+        this.tabList.push(drugList[i])
+        }
+        this.drugList = drugList
+        var goodList =  response.data.data.goodList
+        for(let i=0;i<goodList.length;i++){
+        for(let j=0;j<this.manufactuerList.length;j++){
+            if(goodList[i].manufacturer == this.manufactuerList[j].id){
+                goodList[i].manufacturer = this.manufactuerList[j].manufacturer_name
+            }
+        }
+        for(let y=0;y<this.goodTypeList.length;y++){
+            if(goodList[i].good_type_id == this.goodTypeList[y].id){
+                goodList[i].good_type_id = this.goodTypeList[y].type_name
+            }
+        }
+        goodList[i].supply_name = goodList[i].good_name + " " + goodList[i].specification_name + " " +goodList[i].manufacturer
+        goodList[i].supply_type = goodList[i].good_type_id
+        goodList[i].supply_specification_name =goodList[i].specification_name
+        goodList[i].supply_price = goodList[i].buy_price
+        goodList[i].supply_total = this.getTotalStockCount(goodList[i].good_warehouse_info)
+        goodList[i].supply_count = ""
+        goodList[i].supply_total_price = ""
+        goodList[i].supply_manufacturer = goodList[i].manufacturer
+        goodList[i].supply_license_number = ""
+        goodList[i].supply_remake = ""
+        goodList[i].type = 2
+        goodList[i].name = goodList[i].good_name
+        goodList[i].unitList =  [{id:1,name:""},{id:2,name:""}]
+        goodList[i].supply_unit = goodList[i].packing_unit
+        for(let j=0;j<goodList[i].unitList.length;j++){
+           goodList[i].unitList[0].name = goodList[i].packing_unit 
+        }
+        this.tabList.push(goodList[i])
+        }
+        this.goodList = goodList
+    } 
+    })
+},
+changeGoodName(val){
+  this.currentIndex = val
+},
+changeName(val){
+    //var obj = {"id":0,"name":"合计","supply_name":"","supply_type":"","supply_specification_name":"","supply_total":"","supply_count":"","supply_price":"","supply_total_price":"","supply_manufacturer":"","supply_license_number":"","supply_remake":"","is_total":2}
+   for(let i=0;i<this.recordInfo.tableList.length;i++){
+    if(this.currentIndex == i){
+        this.recordInfo.tableList[i].project_id = val.id
+        this.recordInfo.tableList[i].type = val.type
+        this.recordInfo.tableList[i].name = val.name
+        this.recordInfo.tableList[i].supply_name = val.supply_name
+        this.recordInfo.tableList[i].supply_type = val.supply_type
+        this.recordInfo.tableList[i].supply_specification_name = val.supply_specification_name
+        this.recordInfo.tableList[i].supply_total = val.supply_total
+        if(val.supply_count == NaN){
+           this.recordInfo.tableList[i].supply_count = ""
+        }else{
+          this.recordInfo.tableList[i].supply_count = val.supply_count?val.supply_count:""
+        }
+
+        this.recordInfo.tableList[i].supply_price = val.supply_price?val.supply_price:""
+        this.recordInfo.tableList[i].supply_total_price = val.supply_total_price?val.supply_total_price:""
+        this.recordInfo.tableList[i].supply_manufacturer = val.supply_manufacturer
+        this.recordInfo.tableList[i].supply_license_number = val.supply_license_number
+        this.recordInfo.tableList[i].supply_remake = val.supply_remake
+        this.recordInfo.tableList[i].is_total = val.is_total
+        this.recordInfo.tableList[i].supply_unit = val.supply_unit
+        this.recordInfo.tableList[i].unitList = val.unitList
+     }
+    }
+   
+
+},
+handleEdit(){
+    const tempObj = {}
+    tempObj["id"] = 0
+    tempObj["name"] = ""
+    tempObj['supply_name'] = ""
+    tempObj['supply_type'] = ""
+    tempObj['supply_specification_name'] = ''
+    tempObj['supply_total'] = ""
+    tempObj['supply_count'] = ""
+    tempObj['supply_price'] = ""
+    tempObj['supply_total_price'] = ""
+    tempObj['supply_manufacturer'] = ''
+    tempObj['supply_license_number'] = ''
+    tempObj['supply_remake'] = ''
+    tempObj['type'] = 0
+    tempObj['is_total'] = 1
+    tempObj["project_id"] = 0
+    tempObj["supply_unit"] = ""
+    this.recordInfo.tableList.push(tempObj)
+},
+handleDelete: function(index, row) {
+  if (this.recordInfo.tableList.length <= 1) {
+        this.$message.error('只有一条记录的时候无法删除')
+        return
+   } else {
+        this.recordInfo.tableList.splice(index, 1)
+   }
+},
+
+changeTypeName(){
+
+},
+startTimeChange(){
+
+},
+endTimeChange(){
+
+},
+search(){
+
+},
+
+getWarehoseInfo(arr,max_unit,min_unit,min_number){
+    var total = 0
+    var max_str=  ""
+    var min_str = ""
+    if (arr.length > 0) {
+      for(let i=0;i<arr.length;i++){
+        total += parseInt(arr[i].stock_max_number)
+      }
+    }
+    if (total < min_number){
+        min_str = total + min_unit
+    }
+    if (total == 0) {
+        min_str = ""
+        max_str = ""
+    }
+   if (total >=min_number) {
+    if(parseInt(total/min_number)!=0){
+        max_str = parseInt(total/min_number) + max_unit
+    }
+    if(total%min_number!=0){
+       min_str = total%min_number + min_unit
+    }
+  }
+ return max_str + min_str
+ },
+getTotalStockCount(arr){
+  var total_count = 0
+  for(let i=0;i<arr.length;i++){
+    total_count += arr[i].stock_count
+  }
+  return total_count
+},
+calculate: function(val) {
+    if (isNaN(val)) {
+        return "";
+    }
+    if (val == 0) {
+        return "";
+    }
+    return Math.round(parseFloat(val) * 100) / 100;
+  },
+getTimes(time) {
+    if (time === '') {
+    return ''
+    }
+    return uParseTime(time, '{y}-{m}-{d}')
+},
+ updatePurchaseOrder(){
+   this.loading = true 
+    if(this.supplier_name == 0 || this.supplier_name == ""){
+        this.$message.error("供应商不能为空!")
+        this.loading = false
+        return false
+    }
+   this.$refs["tableForm"].validate((valid)=>{
+      if(valid){
+        for(let i=0;i<this.recordInfo.tableList.length;i++){
+           this.recordInfo.tableList[i].supply_count = parseInt(this.recordInfo.tableList[i].supply_count)
+           this.recordInfo.tableList[i].supply_license_number = this.recordInfo.tableList[i].supply_license_number.toString()
+           this.recordInfo.tableList[i].supply_total_price = (this.recordInfo.tableList[i].supply_count * this.recordInfo.tableList[i].supply_price).toString()
+           this.recordInfo.tableList[i].supply_total = this.recordInfo.tableList[i].supply_total.toString()
+            this.recordInfo.tableList[i].supply_price = this.recordInfo.tableList[i].supply_price.toString()
+           for(let j=0;j<this.manufactuerList.length;j++){
+              if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].manufacturer_name){
+                this.recordInfo.tableList[i].manufacturer_id = this.manufactuerList[j].id
+              }
+           }
+        }
+        var start = this.getTimes(this.start_time)
+        var end = this.getTimes(this.end_time)
+        const params = {
+        'stockIn': this.recordInfo.tableList
+        }
+        console.log("param23232332",params)  
+       
+        updatePurchaseOrder(params,this.supplier_name,start,end,this.rate_of_concession,this.discount_amount,this.id,this.number).then(response=>{
+           if(response.data.state == 1){
+            this.loading = false
+             var warehousingInfo =  response.data.data.warehousingInfo
+             this.$message.success("修改成功!")
+           }
+        })
+      } 
+   })
+ },
+ getAllPrice(){
+   var total_price = 0
+   for(let i=0;i<this.recordInfo.tableList.length;i++){
+      total_price += (this.recordInfo.tableList[i].supply_price * this.recordInfo.tableList[i].supply_count)
+   }  
+   return total_price.toFixed(2)
+ },
+ checkPurchaseOrder(id,index){
+   this.$confirm('是否审核?', {
+    confirmButtonText: '确 定',
+    cancelButtonText: '取 消',
+    type: 'warning'
+    }).then(() => { 
+    checkPurchaseOrder(this.id).then(response => {
+        if (response.data.state == 1) {
+          var info = response.data.data.info
+          this.disabled = true
+          this.$message.success("审核成功!")
+          this.getPurchaseOrderDetail()
+        } 
+     })
+    })
+    .catch(() => {
+    }) 
+  },
+  getPurchaseOrderDetail(){
+      var id = this.$route.query.id
+    getPurchaseOrderDetail(id).then(response=>{
+      if(response.data.state == 1){
+        var info = response.data.data.info
+        this.is_check = info.is_check
+        this.number = info.number
+        this.id = info.id
+        this.supplier_name = info.supplier_id
+        this.rate_of_concession = info.rate_of_concession
+        this.discount_amount = info.discount_amount
+        var orderInfo = response.data.data.orderInfo
+        if(info.is_check == 2){
+           this.disabled = false
+        }
+        if(info.is_check == 1){
+           this.disabled = true
+        }
+        console.log("drugli323322332",this.drugList)
+        var drugList = response.data.data.baseList
+        var goodList = response.data.data.goodList
+        for(let i=0;i<orderInfo.length;i++){
+            orderInfo[i].supply_count = orderInfo[i].count
+            orderInfo[i].supply_price = orderInfo[i].price
+            orderInfo[i].supply_remake = orderInfo[i].remark
+            orderInfo[i].type = orderInfo[i].is_source
+            orderInfo[i].project_id = orderInfo[i].project_id
+            orderInfo[i].supply_unit = orderInfo[i].supply_unit
+           if(orderInfo[i].is_source == 1){
+            for(let j=0;j<drugList.length;j++){
+                if(orderInfo[i].project_id == drugList[j].id){
+                  orderInfo[i].unitList = [{id:1,name:""},{id:2,name:""}]
+                  orderInfo[i].unitList[0].name = drugList[j].max_unit
+                  orderInfo[i].unitList[1].name = drugList[j].min_unit
+                }
+             }  
+            } 
+          if(orderInfo[i].is_source == 2){
+            for(let j=0;j<goodList.length;j++){
+                if(orderInfo[i].project_id == goodList[j].id){
+                    orderInfo[i].unitList = [{id:1,name:""}]
+                    orderInfo[i].unitList[0].name = goodList[j].packing_unit
+                }
+            }  
+          } 
+        }
+        console.log("orderINFO23323232",orderInfo)
+        this.recordInfo.tableList = orderInfo
+      }
+    })  
+  },
+  toPrint(){
+     var id = this.$route.query.id
+     this.$router.push({path:"/purchase/order/print?&id="+id})  
+  },
+  toAdd(){
+    var id = this.$route.query.id
+    if(this.is_check == 2){
+      this.$message.error("该采购订单未审核,不能生成采购数据!")
+      return false
+    }
+    this.$router.push({path:"/good/order/add?id="+id})
+  }
+},
+created(){
+    const tempObj = {}
+    tempObj["id"] = 0
+    tempObj["name"] = ""
+    tempObj['supply_name'] = ""
+    tempObj['supply_type'] = ""
+    tempObj['supply_specification_name'] = ''
+    tempObj['supply_total'] = ""
+    tempObj['supply_count'] = ""
+    tempObj['supply_price'] = ""
+    tempObj['supply_total_price'] = ""
+    tempObj['supply_manufacturer'] = ''
+    tempObj['supply_license_number'] = ''
+    tempObj['supply_remake'] = ''
+    tempObj['type'] = 0
+    tempObj['is_total'] = 1
+    tempObj["project_id"] = 0
+    tempObj["supply_unit"] = ""
+    this.recordInfo.tableList.push(tempObj)
+    this.getInitOrder()
+    this.getPurchaseOrderDetail()
+}
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+border: 1px #dcdfe6 solid;
+padding: 30px 20px 30px 20px;
+
+.border {
+border-bottom: 1px #dcdfe6 solid;
+margin: 0px 0 20px 0;
+}
+}
+
+.title {
+background: #409eff;
+height: 44px;
+line-height: 44px;
+padding: 0 0 0 10px;
+color: #fff;
+margin: 0 0 10px 0;
+}
+
+.edit_separater {
+border-top: 1px solid rgb(233, 233, 233);
+margin-top: 15px;
+margin-bottom: 15px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+background: #6fb5fa;
+}
+
+.count {
+color: #bd2c00;
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+background-color: #d0d3da;
+}
+.el-table__fixed-right{
+  width:150px;
+  bottom: 20px;
+  height: 100%;
+}
+</style>

src/xt_pages/supply/components/purchaseOrderPrint.vue

@@ -0,0 +1,292 @@
+<template>
+    <div class="main-contain">
+        <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+        <el-row style="float:right;">
+            <el-col :span="24">
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+            </el-col>
+        </el-row>
+        </div>
+        <div class="app-container" style="background-color: white;">
+            <div id="print_content">
+                <div class="print_main_content">
+                    <div class="order_title_panl">
+                        <div style="font-size:22px;font-weight:bold;">{{ orgName }}</div>
+                        <span style="font-weight:500;font-size:18px;">购货单</span>
+                    </div>
+                    <div style="display:flex;justify-content: space-between;">
+                      <div style="text-align:left;margin-bottom:1px;font-size: 18px;">
+                        供应商：{{getSupplyName(supplier_id)}}
+                      </div>
+                      <div style="margin-bottom:1px;font-size: 18px;">
+                        单据日期：{{rate_of_concession}}
+                      </div>
+                      <div style="margin-bottom:1px;font-size: 18px;">
+                        单据编号：{{number}}
+                      </div>
+                      <div style="margin-bottom:1px;font-size: 18px;">
+                        币别：RMB
+                      </div>
+                    </div>
+                    
+                    <div class="table_panel">
+                        <table class="table">
+                            <thead>
+                                <tr>
+                                    <td style="line-height:18px;" width="80">序号</td>
+                                    <td style="line-height:18px;" width="80">商品</td>
+                                    <td style="line-height:18px;" width="80">单位</td>
+                                    <td style="line-height:18px;" width="80">数量</td>
+                                    <td style="line-height:18px;" width="80">购货单价</td>
+                                    <td style="line-height:18px;" width="80">折扣率</td>
+                                    <td style="line-height:18px;" width="80">折扣额</td> 
+                                    <td style="line-height:18px;" width="60">购物金额</td>
+                                    <td style="line-height:18px;" width="80">仓库</td>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr v-for='(item,index) in tableList' :key="index">
+                                    <td style="line-height:18px;"><span>{{index+ 1}}</span></td>
+                                    <td style="line-height:18px;"><span>{{item.name}}</span></td>
+                                    <td style="line-height:18px;"><span>{{item.supply_unit}}</span></td>
+                                    <td style="line-height:18px;"><span>{{item.count}}</span></td>
+                                    <td style="line-height:18px;"><span>{{item.price}}</span></td>
+                                    <td style="line-height:18px;"><span>{{rate_of_concession}}</span></td>
+                                    <td style="line-height:18px;"><span>{{discount_amount}}</span></td>
+                                    <td style="line-height:18px;"><span>{{(item.count * item.price).toFixed(2)}}</span></td>
+                                    <td style="line-height:18px;"><span></span></td>
+                                </tr>
+                                <tr>
+                                  <td>合计</td>
+                                  <td colspan="12" style="text-align:right;"></td>
+                               </tr>
+                            </tbody>
+                        </table>
+
+                        <div style="margin-top:1px;">
+                            <div style="width:100px;">折扣额：</div><div style="width:100px;"></div>
+                            <div style="width:100px;">折扣金额：</div><div style="width:100px;"><span></span></div>
+                            <div style="width:100px;">本次付款：</div><div style="width:100px;"><span></span></div>
+                            <div style="width:100px;">本次欠款：</div><div style="width:100px;"></div>
+                       </div>
+                        <div style="margin-top:1px;">
+                            <div style="width:100px;">备注</div><div style="width:100px;"></div>
+                       </div>
+                       <div style="margin-top:1px;">
+                            <div style="width:100px;">制单人：</div><div style="width:100px;"></div>
+                            <div style="width:100px;">收货人签字：</div><div style="width:100px;"><span></span></div>
+                            <div style="width:100px;">供应商签字：</div><div style="width:100px;"><span></span></div>
+                       </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+
+import { fetchAllAdminUsers } from "@/api/doctor";
+import {getPurchaseOrderDetail} from "@/api/supply"
+import print from 'print-js'
+const moment = require('moment')
+import { uParseTime } from '@/utils/tools'
+export default {
+    components:{
+        BreadCrumb
+    },
+    data(){
+        return{
+          crumbs: [
+            { path: false, name: '库存管理' },
+            { path: false, name: '耗材管理' },
+            { path: false, name: '入库单打印' },
+          ],
+            isEdit: 0,
+            checked: false,
+            signAndWeighBoxPatients: "sign-and-weigh-box-patients", 
+            time_now:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+            orgName:'',
+            orgId:'',
+            adminUserOptions:[],
+            tableList:[],
+            number:"",
+            id:"",
+            supplier_id:"",
+            rate_of_concession:"",
+            discount_amount:"",
+            supplyList:[],
+            document_date:"",
+        }
+    },
+    methods:{
+      printAction: function() {
+          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: 14px; padding: 1px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 12px; 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; } }'
+          printJS({
+          printable: 'print_content',
+          type: 'html',
+          documentTitle: '  ',
+          style: style,
+          scanStyles: false
+          })
+      },
+
+      getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
+      fetchAllAdminUsers() {
+        fetchAllAdminUsers().then(response => {
+          if (response.data.state == 1) {
+            this.adminUserOptions = response.data.data.users
+
+          }
+        })
+      },
+      getXuserName(id) {
+        if (id <= 0) {
+          return "";
+        }
+        var name = "";
+        if (
+          this.adminUserOptions == null ||
+          typeof this.adminUserOptions.length === "undefined"
+        ) {
+          return name;
+        }
+        var leng = this.adminUserOptions.length;
+        if (leng == 0) {
+          return name;
+        }
+        for (let index = 0; index < leng; index++) {
+          if (this.adminUserOptions[index].id == id) {
+            name = this.adminUserOptions[index].name;
+            break;
+          }
+        }
+        return name;
+      },
+      getPurchaseOrderDetail(){
+        var id = this.$route.query.id
+        getPurchaseOrderDetail(id).then(response=>{
+        if(response.data.state == 1){
+            var info = response.data.data.info
+            this.is_check = info.is_check
+            this.number = info.number
+            this.id = info.id
+            this.supplier_id = info.supplier_id
+            this.rate_of_concession = info.rate_of_concession
+            this.discount_amount = info.discount_amount
+            this.document_date = info.document_date
+            var orderInfo = response.data.data.orderInfo
+            var supplyList = response.data.data.supplyList
+            this.supplyList = supplyList
+            for(let i=0;i<orderInfo.length;i++){
+                orderInfo[i].supply_count = orderInfo[i].count
+                orderInfo[i].supply_price = orderInfo[i].price
+                orderInfo[i].supply_remake = orderInfo[i].remark
+                orderInfo[i].type = orderInfo[i].is_source
+                orderInfo[i].project_id = orderInfo[i].project_id
+            }
+            console.log("orderINFO23323232",orderInfo)
+            this.tableList = orderInfo
+        }
+      })  
+    },
+    getSupplyName(id){
+      var name = ""
+      for(let i=0;i<this.supplyList.length;i++){
+        if(id == this.supplyList[i].id){
+          name = this.supplyList[i].supplier_name
+        }
+      }
+      return name
+    },
+    },
+    created(){
+      this.orgName = this.$store.getters.xt_user.org.org_name;
+      this.orgId = this.$store.getters.xt_user.org.id;
+      this.fetchAllAdminUsers()
+      this.getPurchaseOrderDetail()
+    
+    }
+}
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.print_main_content {
+  background-color: white;
+  max-width: 1500px;
+  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: 18px;
+            padding: 1px 5px;
+          }
+        }
+      }
+      tbody {
+        tr {
+          td {
+            border: 1px solid;
+            text-align: center;
+            font-size: 18px;
+            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;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>

src/xt_pages/supply/goodOrderQuery.vue

@@ -0,0 +1,387 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div class="app-container ">
+      <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
+        <div>
+        
+          <el-date-picker
+            size="small"
+            v-model="start_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="startTimeChange"
+           ></el-date-picker>-
+            <el-date-picker
+              size="small"
+              v-model="end_time"
+              prefix-icon="el-icon-date"
+              :editable="false"
+              style="width: 196px;"
+              type="date"
+              placeholder="选择日期时间"
+              align="right"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              @change="endTimeChange"
+          ></el-date-picker>
+          <span>审核状态:</span>
+           <el-select v-model="check_id" style="width:140px;margin-right:10px;" placeholder="请选择"
+            @change="changeTypeName">
+            <el-option
+                v-for="item in checkList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id">
+            </el-option>
+          </el-select>
+          <el-input
+            size="small"
+            style="width: 200px;margin-left:10px;"
+            class="filter-item"
+            v-model.trim="keywords"
+            placeholder="订单编号或供应商名称"
+          />
+          <el-button
+            size="small"
+            class="filter-item"
+            type="primary"
+            icon="el-icon-search"
+            @click="search"
+            >搜索</el-button
+          >
+        </div>
+        <div>
+          <el-button size="small" type="primary" @click="toAdd">新增</el-button>
+        </div>
+      </div>
+
+
+       <el-table
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+        :data="tableList"
+        :class="signAndWeighBoxPatients"
+        border
+      >
+        <el-table-column label="单据日期" align="center">
+          <template slot-scope="scope">
+            <span>{{getTimes(scope.row.document_date)}}</span>
+         </template>
+        </el-table-column>
+        <el-table-column label="单据编号" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row.number}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="供应商" align="center">
+            <template slot-scope="scope">
+              <span>{{getName(scope.row.supplier_id)}}</span>
+            </template>
+         </el-table-column>
+        <el-table-column label="关联购货订单号" align="center" width="200">
+          <template slot-scope="scope">
+            
+          </template>
+        </el-table-column>
+        <el-table-column label="购货金额" align="center">
+          <template slot-scope="scope">
+             <span v-if="getAllBuyPrice(scope.row.orderInfo)>0">{{getAllBuyPrice(scope.row.orderInfo)}}</span> 
+          </template>
+        </el-table-column>
+        <el-table-column label="优惠后金额" align="center">
+         <template slot-scope="scope">
+           {{getAllCount(scope.row.orderInfo)}}
+         </template>
+       </el-table-column>
+        <el-table-column label="已付款" align="center">
+         <template slot-scope="scope">
+           {{getAllCount(scope.row.orderInfo)}}
+         </template>
+       </el-table-column>
+       <el-table-column label="数量" align="center">
+         <template slot-scope="scope">
+           {{getAllCount(scope.row.orderInfo)}}
+         </template>
+       </el-table-column>
+
+       <el-table-column label="订单状态" align="center">
+         <template slot-scope="scope">
+           <span v-if="scope.row.is_check == 2">未审核</span>
+           <span v-if="scope.row.is_check == 1">已审核</span>
+         </template>
+       </el-table-column>
+      
+          
+      <el-table-column label="制单人" align="center">
+         <template slot-scope="scope">
+          {{getDocName(scope.row.creater)}}
+         </template>
+       </el-table-column>
+
+      <el-table-column label="审核人" align="center">
+         <template slot-scope="scope">
+          {{getDocName(scope.row.checker)}}
+         </template>
+       </el-table-column>
+
+       <el-table-column label="操作" align="center" width="260px">
+          <template slot-scope="scope">
+              <el-button
+                icon="el-icon-edit-outline"
+                size="small"
+                type="primary"
+                @click="toClick(scope.row.id)"
+              >编辑
+              </el-button>
+              <el-button
+                icon="el-icon-delete"
+                size="small"
+                type="danger"
+                @click="toClickOne(scope.row)"
+              >删除
+              </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100,200,500,1000]"
+        :page-size="10"
+        background
+        align="right"
+        style="margin-top:20px;"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+
+    </div>
+  </div>
+</template>
+
+<script>
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+
+import {getAllSupply,getAllPurchaseOrderList} from "@/api/supply"
+import {uParseTime } from '@/utils/tools'
+export default {
+  name: "stockIn",
+   components: {
+     
+   },
+  components: {
+    BreadCrumb
+  },
+  data() {
+    return {
+      crumbs: [
+        { path: false, name: "采购管理" },
+        { path: "/spply/query", name: "购货单" }
+      ],
+      keywords: "",
+      total: 0,
+      multipleSelection: [],
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      start_time: "",
+      end_time:new Date(),
+      page: 1,
+      limit: 10,
+      goodType: [],
+      goodInfo: [],
+      org_id:0,
+      types:[],
+      tableList:[],
+      type_name:"",
+      checkList:[
+        {id:0,name:"请选择"},
+        {id:1,name:"已审核"},
+        {id:2,name:"未审核"},
+      ],
+      supplyList:[],
+      check_id:0,
+      doctorList:[],
+    };
+  },
+  methods:{
+     toAdd(){
+       this.$router.push({path:"/purchase/order/add"})
+     },
+     changeTypeName(){
+
+     },
+     startTimeChange(){
+
+     },
+     endTimeChange(){
+
+     },
+     search(){
+
+     },
+     handleSizeChange(val){
+       this.limit = val
+       this.getlist()
+     },
+     handleCurrentChange(val){
+       this.page = val
+       this.getlist()
+     },
+     getAllSupply(){
+       getAllSupply().then(response=>{
+         if(response.data.state == 1){
+            var supplyList = response.data.data.supplyList
+            this.doctorList = response.data.data.doctorList
+            for(let i=0;i<supplyList.length;i++){
+              this.supplyList.push(supplyList[i])
+            }
+         }
+       })
+     },
+     changeTypeName(){
+
+     },
+     getTimes(time) {
+      if (time === '') {
+      return ''
+      }
+      return uParseTime(time, '{y}-{m}-{d}')
+     },
+     getlist(){
+        var params = {
+          check_id:this.check_id,
+          start_time:this.getTimes(this.start_time),
+          end_time:this.getTimes(this.end_time),
+          keyword:this.keywords,
+          page:this.page,
+          limit:this.limit,
+        }
+       getAllPurchaseOrderList(params).then(response=>{
+          if(response.data.state == 1){
+            var list = response.data.data.list 
+            console.log("list2332232323232",list)
+            this.tableList = list
+            var total = response.data.data.total
+            this.total = total
+          }
+       })
+     },
+     getName(id){
+       var name = ""
+       for(let i=0;i<this.supplyList.length;i++){
+         if(id == this.supplyList[i].id){
+           name = this.supplyList[i].supplier_name
+         }
+       }
+       return name
+     },
+     getDocName(id){
+      var user_name = ""
+      for(let i=0;i<this.doctorList.length;i++){
+        if(id == this.doctorList[i].admin_user_id){
+          user_name = this.doctorList[i].user_name
+        }
+      }
+      return user_name
+     },
+     getAllBuyPrice(arr){
+       var buy_price = 0
+       if(arr!=undefined && arr.length > 0){
+          for(let i=0;i<arr.length;i++){
+            buy_price += (arr[i].count * arr[i].price)
+          }
+       }
+       return buy_price.toFixed(2)
+     },
+     getAllCount(arr){
+       var count = ""
+        if(arr!=undefined && arr.length > 0){
+          for(let i=0;i<arr.length;i++){
+            count += arr[i].count
+          }
+       }
+       return count
+     },
+     toClick(id){
+       this.$router.push({path:"/purchase/order/edit?id="+id})
+     }
+  },
+  created() {
+    var now = new Date(); //当前日期 
+    var nowMonth = now.getMonth(); //当前月 
+    var nowYear = now.getFullYear(); //当前年 
+    //本月的开始时间
+    var monthStartDate = new Date(nowYear, nowMonth, 1); 
+    this.start_time = monthStartDate
+    this.org_id =  this.$store.getters.xt_user.org_id
+    this.getAllSupply()
+    this.getlist()
+  },
+ 
+};
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+.information {
+  border: 1px #dcdfe6 solid;
+  padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+}
+
+.title {
+  background: #409eff;
+  height: 44px;
+  line-height: 44px;
+  padding: 0 0 0 10px;
+  color: #fff;
+  margin: 0 0 10px 0;
+}
+
+.edit_separater {
+  border-top: 1px solid rgb(233, 233, 233);
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+</style>
+
+<style>
+.sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+  font-size: 12px;
+}
+
+.sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+  background: #6fb5fa;
+}
+
+.count {
+  color: #bd2c00;
+}
+.el-table td,
+.el-table th.is-leaf,
+.el-table--border,
+.el-table--group {
+  border-color: #d0d3da;
+}
+.el-table--border::after,
+.el-table--group::after,
+.el-table::before {
+  background-color: #d0d3da;
+}
+
+</style>

src/xt_pages/supply/purchaseOrderQuery.vue

@@ -136,16 +136,18 @@
        <el-table-column label="操作" align="center" width="260px">
           <template slot-scope="scope">
               <el-button
+                icon="el-icon-edit-outline"
                 size="small"
                 type="primary"
-                @click="toClick(scope.row)"
-              >库存流水
+                @click="toClick(scope.row.id)"
+              >编辑
               </el-button>
               <el-button
+                icon="el-icon-delete"
                 size="small"
-                type="primary"
+                type="danger"
                 @click="toClickOne(scope.row)"
-              >批次
+              >删除
               </el-button>
           </template>
         </el-table-column>
@@ -184,7 +186,7 @@ export default {
     return {
       crumbs: [
         { path: false, name: "采购管理" },
-        { path: "/spply/query", name: "供应商管理" }
+        { path: "/spply/query", name: "购货订单" }
       ],
       keywords: "",
       total: 0,
@@ -308,7 +310,10 @@ export default {
           }
        }
        return count
-     } 
+     },
+     toClick(id){
+       this.$router.push({path:"/purchase/order/edit?id="+id})
+     }
   },
   created() {
     var now = new Date(); //当前日期 
@@ -375,4 +380,5 @@ export default {
 .el-table::before {
   background-color: #d0d3da;
 }
+
 </style>