首頁 探索 說明
註冊 登入
elizebath
/
elizebeth
複製自 csx/Vue_New
關註 1
收藏 0
複製 0
程式碼 問題管理 0 合併請求 0 版本發佈 0 Wiki Activity
瀏覽代碼

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

csx 3 年之前
父節點
fd5e415799 8f871cde59
當前提交
d8aa3754cb
共有 15 個文件被更改，包括 160 次插入 和 117 次删除
分割檢視 顯示文件統計
  1. 1 1
      index.html
  2. 2 0
      src/lang/en.js
  3. 6 1
      src/lang/zh.js
  4. 12 16
      src/router/index.js
  5. 12 1
      src/views/layout/Layout.vue
  6. 16 1
      src/views/layout/components/Sidebar/index.vue
  7. 3 3
      src/xt_pages/outpatientCharges/invoicePrint.vue
  8. 60 60
      src/xt_pages/outpatientCharges/invoiceTemplate/printFour.vue
  9. 31 23
      src/xt_pages/stock/detail/cancelStockDetail.vue
  10. 2 1
      src/xt_pages/stock/drugs/drugStockInOrderAdd.vue
  11. 1 0
      src/xt_pages/stock/drugs/drugStockInOrderEdit.vue
  12. 10 6
      src/xt_pages/stock/drugs/drugStockOutOrder.vue
  13. 2 0
      src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue
  14. 2 1
      src/xt_pages/stock/stockInOrderAdd.vue
  15. 0 3
      src/xt_pages/stock/stockQuery.vue

+ 1 - 1
index.html 查看文件 

@@ -18,7 +18,7 @@
18 18 
   </head>
19 19
20 20 
   <body>
21 
-    <script src="https://cdn.bootcdn.net/ajax/libs/reconnecting-websocket/1.0.0/reconnecting-websocket.min.js"></script>
21 
+    <script src="https://images.shengws.com/reconnecting-websocket.min.js"></script>
22 22 
     <script src="https://cdn.bootcss.com/jquery/3.4.1/jquery.min.js"></script>
23 23 
     <script src="<%= htmlWebpackPlugin.options.path %>/tinymce4.7.5/tinymce.min.js"></script>
24 24 
     <script src="<%= htmlWebpackPlugin.options.path %>/neditor/neditor.config.js"></script>

+ 2 - 0
src/lang/en.js 查看文件 

@@ -95,6 +95,8 @@ export default {
95 95 
     deviceZoneManage: 'Device Zone Manage',
96 96 
     deviceGroupManage: 'Device Group Manage',
97 97 
     stockManage: 'Stock Manage',
98 
+    supplyManage: 'Supply Manage',
99 
+    supplyQuery: 'supply query',
98 100 
     baseInfo: 'base Info',
99 101 
     stockIn: 'stock in',
100 102 
     stockOut: 'stock out',

+ 6 - 1
src/lang/zh.js 查看文件 

@@ -120,6 +120,8 @@ export default {
120 120 
     orderRecord: '订单详情',
121 121 
     recordList: '订单记录',
122 122 
     stockManage: '耗材管理',
123 
+    supplyManage: '采购管理',
124 
+    supplyList: '供应商管理',
123 125 
     goodType: '商品类型',
124 126 
     stockIn: '入库管理',
125 127 
     stockOut: '出库管理',
 
@@ -134,6 +136,9 @@ export default {
134 136 
     stockOutRecord: '出库记录',
135 137 
     addStockIn: '入库',
136 138 
     stockQuery: '库存查询',
139 
+    supplyQuery: '供应商管理',
140 
+    purchaseOrderQuery: '购货订单',
141 
+    addPurchaseOrder: '新增购货订单',
137 142 
     workforce_template: '排班模板设置',
138 143 
     statistics: '统计分析',
139 144 
     statisticalConfig: '统计配置',
 
@@ -262,7 +267,7 @@ export default {
262 267 
     summary_tool: '项目消费明细汇总',
263 268 
     labelPrint: '标签打印',
264 269 
     faPiao: '发票设置',
265 
-    chargeDetailManagement:'收费明细'
270 
+    chargeDetailManagement: '收费明细'
266 271 
   },
267 272 
   navbar: {
268 273 
     logOut: '退出登录',

+ 12 - 16
src/router/index.js 查看文件 

@@ -31,10 +31,7 @@ import hospitalRecord from './modules/hospitalRecord'
31 31 
 import hospitalStation from './modules/hospitalStation'
32 32 
 import hospitalCharges from './modules/hospitalCharges'
33 33 
 import hisTool from './modules/hisTool'
34 
-
35 
-
36 
-
37 
-
34 
+import supply from './modules/supply'
38 35
39 36 
 // import outpatientRecord from './modules/outpatientRecord'
40 37 
 import kuyiShopping from './modules/kuyiShopping'
 
@@ -55,9 +52,7 @@ import templateManagement from './modules/templateManagement'
55 52 
 import DepartManage from './modules/DepartManage'
56 53 
 import basicConfig from './modules/basicConfig'
57 54
58 
-
59 
-
60 
-Vue.use(Router);
55 
+Vue.use(Router)
61 56
62 57 
 /** note: submenu only apppear when children.length>=1
63 58 
  *   detail see  https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
 
@@ -103,7 +98,7 @@ var _constant_router_map = [{
103 98 
   path: '',
104 99 
   component: Layout,
105 100 
   redirect: '/home',
106 
-  name:'home',
101 
+  name: 'home',
107 102 
   children: [{
108 103 
     path: '/home',
109 104 
     component: () => import('@/xt_pages/home/index'),
 
@@ -118,7 +113,7 @@ var _constant_router_map = [{
118 113 
 {
119 114 
   path: '/kuyiShopping',
120 115 
   component: Layout,
121 
-  name:'kuyiShopping',
116 
+  name: 'kuyiShopping',
122 117 
   redirct: '/kuyiShopping/index',
123 118 
   children: [{
124 119 
     path: '/kuyiShopping/index',
 
@@ -142,7 +137,7 @@ service
142 137 
   // device,
143 138 
   // role,
144 139 
   // org
145 
-];
140 
+]
146 141
147 142 
 var _asy_router_map = [
148 143 
   patient,
 
@@ -185,19 +180,20 @@ var _asy_router_map = [
185 180 
   hospitalCharges,
186 181 
   hisTool,
187 182 
   integration,
188 
-  basicConfig
189 
-];
183 
+  basicConfig,
184 
+  supply
185 
+]
190 186
191 
-var is_asy_router = process.env.NODE_ENV === 'production'; // true; 设置为 true 强制进行路由验证
187 
+var is_asy_router = process.env.NODE_ENV === 'production' // true; 设置为 true 强制进行路由验证
192 188 
 if (!is_asy_router) {
193 
-  _constant_router_map = _constant_router_map.concat(_asy_router_map);
189 
+  _constant_router_map = _constant_router_map.concat(_asy_router_map)
194 190 
   _asy_router_map = []
195 191 
 } else {
196 192
197 193 
 }
198 194
199 
-export const xt_constantRouterMap = _constant_router_map;
200 
-export const xt_asyncRouterMap = _asy_router_map;
195 
+export const xt_constantRouterMap = _constant_router_map
196 
+export const xt_asyncRouterMap = _asy_router_map
201 197
202 198 
 export default new Router({
203 199 
   // mode: 'history', // require service support

+ 12 - 1
src/views/layout/Layout.vue 查看文件 

@@ -16,6 +16,10 @@
16 16 
           <i class="iconfont icon-computer_fill navIcon"></i>
17 17 
           <p>透析管理</p>
18 18 
         </div>
19 
+        <!-- <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
20 
+          <i class="iconfont icon-kccx navIcon"></i>
21 
+          <p>采购管理</p>
22 
+        </div> -->
19 23 
         <div v-if="kucunShow" :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库房管理')">
20 24 
           <i class="iconfont icon-kccx navIcon"></i>
21 25 
           <p>库房管理</p>
 
@@ -119,14 +123,15 @@ export default {
119 123 
       kucunShow:true,
120 124 
       peizhiShow:true,
121 125 
       kuyishoppingShow:true,
126 
+      caigouShow:true,
122 127 
     }
123 128 
   },
124 129 
   created(){
125 
-    console.log('permission_routers',this.permission_routers);
126 130 
     let menzhen = ['hospitalStation',"hospitalRecord","hospitalCharges","hisTool",'outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord'];
127 131 
     let bingli = ['User','createPatient'];
128 132 
     let touxi = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control'];
129 133 
     let kucun = ['stockManage','stockDrugs','selfPreparedMedicine','otherManagement'];
134 
+    let caigou = ['supplyManage','supplyList'];
130 135 
     let peizhi = ['system','roleManage','DepartManage', 'bedManagement', 'dictionaryManagement', 'templateManagement','showconfig','printTemplate','integration_config','basicConfig'];
131 136 
     let kuyishopping = ['kuyiShopping'];
132 137 
     let menzhenArr = [];
 
@@ -135,6 +140,7 @@ export default {
135 140 
     let kucunArr = [];
136 141 
     let peizhiArr = [];
137 142 
     let kuyishoppingArr = [];
143 
+    let caigouArr =[]
138 144 
     this.permission_routers.map(item => {
139 145 
       if(menzhen.indexOf(item.name) > -1){
140 146 
         menzhenArr.push(item)
 
@@ -148,6 +154,8 @@ export default {
148 154 
         peizhiArr.push(item)
149 155 
       }else if(kuyishopping.indexOf(item.name) > -1){
150 156 
         kuyishoppingArr.push(item)
157 
+      }else if(caigou.indexOf(item.name)>-1){
158 
+         caigouArr.push(item)
151 159 
       }
152 160 
     });
153 161 
     // console.log('menzhenArr.length',menzhenArr.length)
 
@@ -156,6 +164,7 @@ export default {
156 164 
     // console.log('kucunArr.length',kucunArr.length)
157 165 
     // console.log('peizhiArr.length',peizhiArr.length)
158 166 
     // console.log('kuyishoppingArr.length',kuyishoppingArr.length)
167 
+    console.log("cagouArr23323322323",caigouArr.length)
159 168 
     if(menzhenArr.length == 0){
160 169 
       this.menzhenShow = false
161 170 
     }else if(bingliArr.length == 0){
 
@@ -168,6 +177,8 @@ export default {
168 177 
       this.peizhiShow = false
169 178 
     }else if(kuyishoppingArr.length == 0){
170 179 
       this.kuyishoppingShow = false
180 
+    }else if(caigouArr.length == 0){
181 
+      this.caigouShow = false
171 182 
     }
172 183 
   },
173 184 
   computed: {

+ 16 - 1
src/views/layout/components/Sidebar/index.vue 查看文件 

@@ -122,7 +122,22 @@ export default {
122 122 
           }
123 123 
         }else if(newVal == '库房管理'){
124 124 
           let nameArr = ['stockManage','stockDrugs','selfPreparedMedicine','otherManagement'];
125 
-          // console.log('permission_routers',this.permission_routers)
125 
+          let routerArr = [];
126 
+          this.permission_routers.map(item => {
127 
+            if(nameArr.indexOf(item.name) > -1){
128 
+              routerArr.push(item)
129 
+            }
130 
+          });
131 
+          this.arr = routerArr;
132 
+          if(this.arr.length > 0){
133 
+            let a = true;
134 
+            this.$emit('func',a)
135 
+          }else{
136 
+            let a = false;
137 
+            this.$emit('func',a)
138 
+          }
139 
+        }else if(newVal == "采购管理"){
140 
+          let nameArr = ['supplyManage','supplyList'];
126 141 
           let routerArr = [];
127 142 
           this.permission_routers.map(item => {
128 143 
             if(nameArr.indexOf(item.name) > -1){

+ 3 - 3
src/xt_pages/outpatientCharges/invoicePrint.vue 查看文件 

@@ -13,12 +13,12 @@
13 13 
     </template>
14 14 
     <div class="app-container" style="padding-top:40px;">
15 15 
         <div class='dialysisPage'>
16 
-          <div v-if="org_id != 10106 && org_id != 10215" >
16 
+          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4" >
17 17 
             <printOne v-if="org_id != 10088" :paramsObj="invoiceParams"></printOne>
18 18 
             <printThree v-if="org_id == 10088" :paramsObj="invoiceParams"></printThree>
19 19 
           </div>
20 20 
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
21 
-          <printFour v-if="org_id == 10215" :paramsObj="invoiceParams"></printFour>
21 
+          <printFour v-if="org_id == 10215 || org_id == 4" :paramsObj="invoiceParams"></printFour>
22 22 
         </div>
23 23 
     </div>
24 24 
   </div>
 
@@ -74,7 +74,7 @@ export default {
74 74 
     },
75 75 
     printThisPage() {
76 76 
         const style =
77 
-        '@media print {#invoice-print{font-size:12px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
77 
+        '@media print {#invoice-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
78 78 
         printJS({
79 79 
             printable: "invoice-print",
80 80 
             type: "html",

+ 60 - 60
src/xt_pages/outpatientCharges/invoiceTemplate/printFour.vue 查看文件 

@@ -1,141 +1,141 @@
1 1 
 <template>
2 
-    <div id='invoice-print' style="font-size:16px;">
2 
+    <div id='invoice-print' style="font-size:14px;">
3 3 
         <div style="display:flex;">
4 
-            <div style="position: absolute;top:80px;left:70px;">{{ list.order_number }}</div>
4 
+            <div style="position: absolute;top:65px;left:60px;">{{ list.order_number }}</div>
5 5 
             <!-- <div>{{ list.id_card_no }}</div> -->
6 6 
         </div>
7 7 
         <div style="display:flex;justify-content: space-between;">
8 8 
             <!-- <div>{{ list.department_name }}</div> -->
9 
-            <div  style="position: absolute;top:80px;left:320px">{{ list.id_card_no }}</div>
9 
+            <div  style="position: absolute;top:65px;left:280px">{{ list.id_card_no }}</div>
10 10 
             <div></div>
11 11 
         </div>
12 12 
         <div style="display:flex;justify-content: space-between;">
13 13 
             <!-- <div>{{ list.department_name }}</div> -->
14 
-            <div  style="position: absolute;top:110px;left:70px">门诊</div>
14 
+            <div  style="position: absolute;top:85px;left:90px">门诊</div>
15 15 
             <div></div>
16 
-            <div  style="position: absolute;top:110px;left:300px">{{ list.number }}</div>
17 
-            <div  style="position: absolute;left:650px;top:110px;">
16 
+            <div  style="position: absolute;top:85px;left:240px">{{ list.number }}</div>
17 
+            <div  style="position: absolute;left:480px;top:85px;">
18 18 
                 <span>{{ printDate.slice(0,4) }}</span>
19 19 
             </div>
20 
-            <div  style="position: absolute;left:700px;top:110px;">
20 
+            <div  style="position: absolute;left:530px;top:85px;">
21 21 
                 <span>{{ printDate.slice(5,7) }}</span>
22 22 
             </div>
23 
-            <div  style="position: absolute;left:720px;top:110px;">
23 
+            <div  style="position: absolute;left:580px;top:85px;">
24 24 
                 <span>{{ printDate.slice(8,11) }}</span>
25 25 
             </div>
26 26 
         </div>
27 27 
         <div style="display:flex;justify-content: space-between;">
28 
-            <div style="position: absolute;top:130px;left:120px;"> {{ paramsObj.name }}</div>
29 
-            <div style="position: absolute;top:130px;left:240px;">√</div>
28 
+            <div style="position: absolute;top:100px;left:120px;"> {{ paramsObj.name }}</div>
29 
+            <div style="position: absolute;top:100px;left:200px;">√</div>
30 30 
             <!-- <div>{{ list.pay_way }}</div> -->
31 
-            <div style="position: absolute;top:130px;left:620px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
32 
-            <div style="position: absolute;top:130px;left:720px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
31 
+            <div style="position: absolute;top:100px;left:400px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
32 
+            <div style="position: absolute;top:100px;left:580px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
33 33 
         </div>
34 34 
         <div style="display:flex;justify-content: space-between;">
35 35 
             <!-- <div>{{ paramsObj.gend == 1 ? '男' : '女' }}</div> -->
36 
-            <div v-if="paramsObj.gend == 1" style="position: absolute;top:160px;left:80px;">√</div>
37 
-            <div v-else style="position: absolute;top:160px;left:120px;">√</div>
38 
-            <div style="position: absolute;top:160px;left:340px;">{{ totalPrice - list.psn_cash_money }}</div>
39 
-            <div style="position: absolute;top:160px;left:540px;">{{ list.psn_cash_money }}</div>
40 
-            <div style="position: absolute;top:160px;left:720px;">现金</div>
36 
+            <div v-if="paramsObj.gend == 1" style="position: absolute;top:120px;left:60px;">√</div>
37 
+            <div v-else style="position: absolute;top:120px;left:100px;">√</div>
38 
+            <div style="position: absolute;top:130px;left:260px;">{{ totalPrice - list.psn_cash_money }}</div>
39 
+            <div style="position: absolute;top:130px;left:420px;">{{ list.psn_cash_money }}</div>
40 
+            <div style="position: absolute;top:130px;left:580px;">现金</div>
41 41 
         </div>
42 42 
         <div style="display:flex;justify-content: space-between;">
43 
-            <div style="position: absolute;top:220px;left:40px">西药</div>
44 
-            <div style="position: absolute;top:220px;left:130px">{{ list.westernMedicineCostTotal }}</div>
45 
-            <div style="position: absolute;top:220px;left:240px">检查费</div>
46 
-            <div style="position: absolute;top:220px;left:320px">{{ list.checkCostTotal }}</div>
47 
-            <div style="position: absolute;top:220px;left:440px">治疗费</div>
48 
-            <div style="position: absolute;top:220px;left:540px">{{ list.treatCostTotal }}</div>
49 
-            <div style="position: absolute;top:220px;left:620px">床位费</div>
50 
-            <div style="position: absolute;top:220px;left:720px">{{ list.bedCostTotal }}</div>
43 
+            <div style="position: absolute;top:165px;left:50px">西药</div>
44 
+            <div style="position: absolute;top:165px;left:130px">{{ list.westernMedicineCostTotal }}</div>
45 
+            <div style="position: absolute;top:165px;left:210px">检查费</div>
46 
+            <div style="position: absolute;top:165px;left:280px">{{ list.checkCostTotal }}</div>
47 
+            <div style="position: absolute;top:165px;left:340px">治疗费</div>
48 
+            <div style="position: absolute;top:165px;left:420px">{{ list.treatCostTotal }}</div>
49 
+            <div style="position: absolute;top:165px;left:480px">床位费</div>
50 
+            <div style="position: absolute;top:165px;left:580px">{{ list.bedCostTotal }}</div>
51 51 
         </div>
52 52 
         <div style="display:flex;justify-content: space-between;">
53 
-            <div style="position: absolute;top:250px;left:40px">中成药</div>
54 
-            <div style="position: absolute;top:250px;left:130px">{{ list.chineseTraditionalMedicineCostTotal }}</div>
55 
-            <div style="position: absolute;top:250px;left:240px">化验费</div>
56 
-            <div style="position: absolute;top:250px;left:320px">{{ list.laboratoryCostTotal }}</div>
57 
-            <div style="position: absolute;top:250px;left:440px">手术费</div>
58 
-            <div style="position: absolute;top:250px;left:540px">{{ list.operationCostTotal }}</div>
59 
-            <div style="position: absolute;top:250px;left:620px">其他费</div>
60 
-            <div style="position: absolute;top:250px;left:720px">{{ list.otherCostTotal }}</div>
53 
+            <div style="position: absolute;top:185px;left:50px">中成药</div>
54 
+            <div style="position: absolute;top:185px;left:130px">{{ list.chineseTraditionalMedicineCostTotal }}</div>
55 
+            <div style="position: absolute;top:185px;left:210px">化验费</div>
56 
+            <div style="position: absolute;top:185px;left:280px">{{ list.laboratoryCostTotal }}</div>
57 
+            <div style="position: absolute;top:185px;left:340px">手术费</div>
58 
+            <div style="position: absolute;top:185px;left:420px">{{ list.operationCostTotal }}</div>
59 
+            <div style="position: absolute;top:185px;left:480px">其他费</div>
60 
+            <div style="position: absolute;top:185px;left:580px">{{ list.otherCostTotal }}</div>
61 61 
         </div>
62 62 
         <div style="display:flex;justify-content: space-between;">
63 
-            <div style="position: absolute;top:280px;left:40px"></div>
64 
-            <div style="position: absolute;top:280px;left:130px"></div>
65 
-            <div style="position: absolute;top:280px;left:240px"></div>
66 
-            <div style="position: absolute;top:280px;left:320px"></div>
67 
-            <div style="position: absolute;top:280px;left:440px">材料费</div>
68 
-            <div style="position: absolute;top:280px;left:540px">{{ list.materialCostTotal }}</div>
69 
-            <div style="position: absolute;top:280px;left:620px"></div>
70 
-            <div style="position: absolute;top:280px;left:720px"></div>
63 
+            <div style="position: absolute;top:205px;left:50px"></div>
64 
+            <div style="position: absolute;top:205px;left:130px"></div>
65 
+            <div style="position: absolute;top:205px;left:210px"></div>
66 
+            <div style="position: absolute;top:205px;left:280px"></div>
67 
+            <div style="position: absolute;top:205px;left:340px">材料费</div>
68 
+            <div style="position: absolute;top:205px;left:420px">{{ list.materialCostTotal }}</div>
69 
+            <div style="position: absolute;top:205px;left:480px"></div>
70 
+            <div style="position: absolute;top:205px;left:580px"></div>
71 71 
         </div>
72 72 
         <div style="display:flex;justify-content: space-between;">
73 
-            <div style="position: absolute;top:310px;left:40px"></div>
74 
-            <div style="position: absolute;top:310px;left:130px"></div>
75 
-            <div style="position: absolute;top:310px;left:240px">补收</div>
76 
-            <div style="position: absolute;top:310px;left:320px">{{ list.psn_cash_money }}</div>
77 
-            <div style="position: absolute;top:310px;left:440px"></div>
78 
-            <div style="position: absolute;top:310px;left:540px"></div>
79 
-            <div style="position: absolute;top:310px;left:620px"></div>
80 
-            <div style="position: absolute;top:310px;left:720px"></div>
73 
+            <div style="position: absolute;top:225px;left:50px"></div>
74 
+            <div style="position: absolute;top:225px;left:130px"></div>
75 
+            <div style="position: absolute;top:225px;left:210px"></div>
76 
+            <div style="position: absolute;top:225px;left:280px">{{ list.psn_cash_money }}</div>
77 
+            <div style="position: absolute;top:225px;left:340px"></div>
78 
+            <div style="position: absolute;top:225px;left:420px"></div>
79 
+            <div style="position: absolute;top:225px;left:480px"></div>
80 
+            <div style="position: absolute;top:225px;left:580px"></div>
81 81 
         </div>
82 82 
         <div>
83 83 
             <span>
84 
-            <span  style="position: absolute;top:340px;left:220px">
84 
+            <span  style="position: absolute;top:250px;left:200px">
85 85 
                 <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
86 86 
                     {{ zhongwen.substring(0,1) }}
87 87 
                 </span>
88 88 
                 <span v-else>零</span>
89 89 
             </span>
90 
-            <span  style="position: absolute;top:340px;left:260px">
90 
+            <span  style="position: absolute;top:250px;left:230px">
91 91 
                 <span v-if="zhongwen.indexOf('万') > -1">
92 92 
                     {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
93 93 
                 </span>
94 94 
                 <span v-else>零</span>
95 95 
             </span>
96 
-            <span  style="position: absolute;top:340px;left:310px">
96 
+            <span  style="position: absolute;top:250px;left:260px">
97 97 
                 <span v-if="zhongwen.indexOf('仟') > -1">
98 98 
                     {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}
99 99 
                 </span>
100 100 
                 <span v-else>零</span>
101 101 
             </span>
102 
-            <span  style="position: absolute;top:340px;left:360px">
102 
+            <span  style="position: absolute;top:250px;left:300px">
103 103 
                 <span v-if="zhongwen.indexOf('佰') > -1">
104 104 
                     {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
105 105 
                 </span>
106 106 
                 <span v-else>零</span>
107 107 
             </span>
108 
-            <span style="position: absolute;top:340px;left:410px">
108 
+            <span style="position: absolute;top:250px;left:330px">
109 109 
                 <span v-if="zhongwen.indexOf('拾') > -1">
110 110 
                     {{ zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
111 111 
                 </span>
112 112 
                 <span v-else>零</span>
113 113 
             </span>
114 
-            <span  style="position: absolute;top:340px;left:460px">
114 
+            <span  style="position: absolute;top:250px;left:370px">
115 115 
                 <span v-if="zhongwen.indexOf('元') > -1 && zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) != '拾'">
116 116 
                     {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}
117 117 
                 </span>
118 118 
                 <span v-else>零</span>
119 119 
             </span>
120 
-            <span  style="position: absolute;top:340px;left:510px">
120 
+            <span  style="position: absolute;top:250px;left:400px">
121 121 
                 <span v-if="zhongwen.indexOf('角') > -1">
122 122 
                     {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
123 123 
                 </span>
124 124 
                 <span v-else>零</span>
125 125 
             </span>
126 
-            <span  style="position: absolute;top:340px;left:560px">
126 
+            <span  style="position: absolute;top:250px;left:430px">
127 127 
                 <span v-if="zhongwen.indexOf('分') > -1">
128 128 
                     {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}
129 129 
                 </span>
130 130 
                 <span v-else>零</span>
131 131 
             </span>
132 132 
             </span>
133 
-            <span style="position: absolute;top:340px;left:600px">{{ totalPrice }}</span>
133 
+            <span style="position: absolute;top:250px;left:500px">{{ totalPrice }}</span>
134 134 
         </div>
135 135 
         <!-- <div style="position: absolute;top:300px;left:460px">现金：{{ list.psn_cash_money }}</div> -->
136 136 
         <div>
137 
-            <div style="position: absolute;top:480px;left:160px">{{ org_name }}</div>
138 
-            <div style="position: absolute;top:480px;left:600px">高慧裕</div>
137 
+            <div style="position: absolute;top:320px;left:120px">{{ org_name }}</div>
138 
+            <div style="position: absolute;top:320px;left:460px">高慧裕</div>
139 139 
         </div>
140 140 
     </div>
141 141 
 </template>

+ 31 - 23
src/xt_pages/stock/detail/cancelStockDetail.vue 查看文件 

@@ -344,27 +344,35 @@ export default {
344 344 
       return name;
345 345 
     },
346 346 
     search: function() {
347 
-      const Params = {
348 
-        page: this.page,
349 
-        limit: this.limit,
350 
-        start_time: this.start_time,
351 
-        end_time: this.end_time,
352 
-        type: this.type,
353 
-        keywords: this.searchKey
354 
-      };
355 
-
356 
-      this.cancelStockDate = [];
357 
-      getStockDetail(Params).then(response => {
358 
-        if (response.data.state == 0) {
359 
-          this.$message.error(response.data.msg);
360 
-          return false;
361 
-        } else {
362 
-          this.total = response.data.data.total;
363 
-          for (let i = 0; i < response.data.data.list.length; i++) {
364 
-            this.cancelStockDate.push(response.data.data.list[i]);
365 
-          }
366 
-        }
367 
-      });
347 
+      this.GetCancelStock()
348 
+      // const Params = {
349 
+      //   page: this.page,
350 
+      //   limit: this.limit,
351 
+      //   start_time: this.start_time,
352 
+      //   end_time: this.end_time,
353 
+      //   type: this.type,
354 
+      //   keywords: this.searchKey
355 
+      // };
356 
+      // console.log("param2332233223",Params)
357 
+      // this.cancelStockDate = [];
358 
+      // getStockDetail(Params).then(response => {
359 
+      //   if (response.data.state == 0) {
360 
+      //     this.$message.error(response.data.msg);
361 
+      //     return false;
362 
+      //   } else {
363 
+      //     this.total = response.data.data.total;
364 
+      //     console.log("list322232232",response.data.data.list)
365 
+      //     for (let i = 0; i < response.data.data.list.length; i++) {
366 
+      //       var obj = response.data.data.list[i];
367 
+      //       response.data.data.list[i].total = (response.data.data.list[i].price * response.data.data.list[i].count).toFixed(2)
368 
+      //       total += response.data.data.list[i].price * response.data.data.list[i].count
369 
+      //       obj["is_total"] = 0;
370 
+      //       this.cancelStockDate.push(obj);
371 
+      //       this.cancelStockDate.push(response.data.data.list[i])
372 
+      //     }
373 
+
374 
+      //   }
375 
+      // });
368 376 
     },
369 377 
     AddNewOrder: function() {
370 378 
       this.$router.push({
 
@@ -384,7 +392,7 @@ export default {
384 392 
         dealer: this.dealer_id,
385 393 
         keywords: this.searchKey
386 394 
       };
387 
-      console.log("Params23232233223232332",Params)
395 
+      // console.log("Params23232233223232332",Params)
388 396 
       this.cancelStockDate = [];
389 397 
       getStockDetail(Params).then(response => {
390 398 
         if (response.data.state == 0) {
 
@@ -392,7 +400,7 @@ export default {
392 400 
           return false;
393 401 
         } else {
394 402 
           this.total = response.data.data.total;
395 
-          console.log("数据源头",response.data.data.list)
403 
+          // console.log("数据源头",response.data.data.list)
396 404 
           var total = 0
397 405 
           for (let i = 0; i < response.data.data.list.length; i++) {
398 406

+ 2 - 1
src/xt_pages/stock/drugs/drugStockInOrderAdd.vue 查看文件 

@@ -588,6 +588,7 @@
588 588 
         tempObj['dealer'] = ''
589 589 
         tempObj['manufacturer'] = ''
590 590 
         tempObj['min_unit'] = ''
591 
+        tempObj['max_unit'] = ''
591 592 
         tempObj["drug_type"] = ''
592 593 
         tempObj['batch_number'] = ''
593 594 
         tempObj['dose']= ''
 
@@ -846,7 +847,7 @@
846 847 
         this.currentIndex = val
847 848 
       },
848 849 
       handleSelect(val){
849 
-         console.log("val233232323223",val)
850 
+
850 851 
          for(let i=0;i<this.recordInfo.recordData.length;i++){
851 852 
            if(i == this.currentIndex){
852 853 
              this.recordInfo.recordData[i].drug_id  = val.id

+ 1 - 0
src/xt_pages/stock/drugs/drugStockInOrderEdit.vue 查看文件 

@@ -156,6 +156,7 @@
156 156 
                     v-model="scope.row.warehousing_count"
157 157 
                     style="width:80px"
158 158 
                   ></el-input>
159 
+                   <!-- {{scope.row.max_unit}} -->
159 160 
                    <el-select v-model="scope.row.max_unit" filterable placeholder="请选择单位" style="width:80px">
160 161 
                     <el-option
161 162 
                       v-for="(option, index) in unitList"

+ 10 - 6
src/xt_pages/stock/drugs/drugStockOutOrder.vue 查看文件 

@@ -906,6 +906,7 @@ export default {
906 906 
          id:id,
907 907 
          start_time:start_time,
908 908 
        }
909 
+      console.log("is_sys22222",is_sys)
909 910 
      getSinleOrderDetail(params).then(response=>{
910 911 
         if(response.data.state == 1){
911 912 
           this.tableShow = true
 
@@ -928,15 +929,17 @@ export default {
928 929 
             this.drugFlowList = drugFlowList
929 930 
          }
930 931 
          if(is_sys == 0){
931 
-            for(let i=0;i<list.length;i++){
932 
-              if(list[i].count_unit == list[i].max_unit){
933 
-                  list[i].count = list[i].count * list[i].min_number
932 
+            var flowlist = response.data.data.flowlist
933 
+            this.drugFlowList = []
934 
+            for(let i=0;i<flowlist.length;i++){
935 
+              if(flowlist[i].count_unit == flowlist[i].max_unit){
936 
+                  flowlist[i].count = flowlist[i].count * list[i].min_number
934 937 
               }
935 
-              if(list[i].count_unit == list[i].min_unit){
936 
-                  list[i].count = list[i].count
938 
+              if(flowlist[i].count_unit == flowlist[i].min_unit){
939 
+                  flowlist[i].count = flowlist[i].count
937 940 
               }
938 941 
             }
939 
-            this.drugFlowList = list
942 
+            this.drugFlowList = flowlist
940 943 
          }
941 944
942 945 
          for(let i=0;i<list.length;i++){
 
@@ -1070,6 +1073,7 @@ export default {
1070 1073 
          return str + min_str
1071 1074 
       },
1072 1075 
       getTotalCountOne(id,min_number,max_unit,min_unit){
1076 
+        console.log("hhhahdhhff",this.drugFlowList)
1073 1077 
         var arr = []
1074 1078 
         for(let i=0;i<this.drugFlowList.length;i++){
1075 1079 
           if(id == this.drugFlowList[i].drug_id){

+ 2 - 0
src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue 查看文件 

@@ -422,6 +422,8 @@ export default {
422 422 
       tempObj["batch_number"] = ""
423 423 
       tempObj["max_unit"] = ""
424 424 
       tempObj["warehouse_info_id"] = 0
425 
+      tempObj["dealer"] = ""
426 
+      tempObj['manufacturer'] = ''
425 427 
       this.recordInfo.recordData.push(tempObj);
426 428 
     },
427 429 
     handleDelete: function(index, row) {

+ 2 - 1
src/xt_pages/stock/stockInOrderAdd.vue 查看文件 

@@ -494,7 +494,8 @@
494 494 
           }
495 495 
         }
496 496 
         return name
497 
-      }, handleEdit: function(index, row) {
497 
+      },
498 
+      handleEdit: function(index, row) {
498 499 
         const tempObj = {}
499 500 
         tempObj['good_type_id'] = 0
500 501 
         tempObj['good_id'] = 0

+ 0 - 3
src/xt_pages/stock/stockQuery.vue 查看文件 

@@ -109,9 +109,6 @@
109 109 
        <el-table-column label="出库数量" align="center" v-if="showOne">
110 110 
          <template slot-scope="scope">
111 111 
           <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id ==  10088 || org_id == 10191 || org_id == 9919 || org_id == 10265 || org_id == 10164 || org_id ==10290 ">
112 
-            <!-- <span>
113 
-              {{getWareInfo(scope.row.xt_warehouse_info) - getOverFlushInfo(scope.row.xt_warehouse_info) + getCancelSotckInfo(scope.row.cancel_stock_info) }}
114 
-            </span> -->
115 112 
              <span>
116 113 
               {{getWareInfo(scope.row.xt_warehouse_info) - getOverFlushInfo(scope.row.xt_warehouse_info)}}
117 114 
             </span>