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

@@ -8,3 +8,34 @@ export function getInitOrder(params) {
   })
 }
 
+export function savePurchaseOrder(data, supplier_name, start_time, end_time, rate_of_concession, discount_amount) {
+  return request({
+    url: '/api/supply/savepurchaseorder?supplier_name=' + supplier_name + '&start_time=' + start_time + '&end_time=' + end_time + '&rate_of_concession=' + rate_of_concession + '&discount_amount=' + discount_amount,
+    method: 'post',
+    data: data
+  })
+}
+
+export function getAllSupply(params) {
+  return request({
+    url: '/api/supply/getallsupply',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getAllPurchaseOrderList(params) {
+  return request({
+    url: '/api/supply/getallpurchaseorderlist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function updatePurchaseOrder(data, supplier_name, start_time, end_time, rate_of_concession, discount_amount, id, number) {
+  return request({
+    url: '/api/supply/updatepurchaseorder?supplier_name=' + supplier_name + '&start_time=' + start_time + '&end_time=' + end_time + '&rate_of_concession=' + rate_of_concession + '&discount_amount=' + discount_amount + '&id=' + id + '&number=' + number,
+    method: 'post',
+    data: data
+  })
+}

src/router/modules/supply.js

@@ -37,7 +37,10 @@ export default {
       path: '/purchase/order/add',
       component: () => import('@/xt_pages/supply/components/addPurchaseOrder'),
       name: 'addPurchaseOrder',
-      meta: { title: 'addPurchaseOrder', noCache: true }
+      meta: { title: 'addPurchaseOrder', noCache: true },
+      hidden: true,
+      is_menu: false,
+      isChild: true
     }
   ]
 }

src/xt_pages/dialysis/components/consumablesDialog.vue

@@ -155,7 +155,7 @@
                   this.tableData.push(response.data.data.list[i])
                }
              }
-             console.log("表哥22222222222",this.tableData) 
+            
           })
        },
 

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

@@ -432,7 +432,7 @@
         <el-row :gutter="20"> -->
 
         <el-col :span="8" v-if="isShow('实际置换量')">
-          <el-form-item v-if="this.template_id == 20 || this.template_id == 21" label="实际置换量(ml): ">
+          <el-form-item v-if="this.template_id == 20 || this.template_id == 21 || this.template_id == 13" label="实际置换量(ml): ">
             <el-input v-model="form.actual_displacement"></el-input>
           </el-form-item>
           <el-form-item v-else label="实际置换量(L): ">

src/xt_pages/hospitalStation/summary.vue

@@ -566,7 +566,7 @@
         }
       },
       toPrint(row) {
-        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10138)) {
+        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10138) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10278)) {
           this.statementVisible9504 = true
           let obj = {
             order_id: row.id,

src/xt_pages/medicalScheduling/index.vue

@@ -956,7 +956,7 @@ export default {
                     
                     this.tableData = data
 
-                   console.log("表哥3333333333",this.tableData)
+              
                 }
             })
         },

src/xt_pages/outpatientCharges/invoiceTemplate/printFour.vue

@@ -15,28 +15,28 @@
             <div></div>
             <div  style="position: absolute;top:70px;left:240px">{{ list.number }}</div>
             <div  style="position: absolute;left:470px;top:70px;">
-                <span>{{ printDate.slice(0,4) }}</span>
+                <span>{{  paramsObj.setl_time ? paramsObj.setl_time.split(' ')[0].slice(0,4) : getTime(list.date, '{y}-{m}-{d}').slice(0,4) }}</span>
             </div>
             <div  style="position: absolute;left:530px;top:70px;">
-                <span>{{ parseInt(printDate.slice(5,7)) }}</span>
+                <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(5,7)) : getTime(list.date, '{y}-{m}-{d}').slice(5,7) }}</span>
             </div>
             <div  style="position: absolute;left:560px;top:70px;">
-                <span>{{ parseInt(printDate.slice(8,11)) }}</span>
+                <span>{{ paramsObj.setl_time ? parseInt(paramsObj.setl_time.split(' ')[0].slice(8,11)) : getTime(list.date, '{y}-{m}-{d}').slice(8,11) }}</span>
             </div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <div style="position: absolute;top:85px;left:100px;"> {{ paramsObj.name }}</div>
             <div style="position: absolute;top:85px;left:180px;">√</div>
             <!-- <div>{{ list.pay_way }}</div> -->
-            <div style="position: absolute;top:85px;left:380px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
-            <div style="position: absolute;top:85px;left:530px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
+            <div style="position: absolute;top:85px;left:380px;">{{ printDate }}</div>
+            <div style="position: absolute;top:85px;left:530px;">{{ printDate }}</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
             <!-- <div>{{ paramsObj.gend == 1 ? '男' : '女' }}</div> -->
             <div v-if="paramsObj.gend == 1" style="position: absolute;top:110px;left:100px;">√</div>
             <div v-else style="position: absolute;top:110px;left:140px;">√</div>
-            <div style="position: absolute;top:110px;left:260px;">{{ (totalPrice - list.psn_cash_money).toFixed(2) }}</div>
-            <div style="position: absolute;top:110px;left:420px;">{{ list.psn_cash_money.toFixed(2) }}</div>
+            <div style="position: absolute;top:110px;left:260px;">{{ list.number.length <= 13 ? (totalPrice - list.psn_cash_money).toFixed(2) : '0.00' }}</div>
+            <div style="position: absolute;top:110px;left:420px;">{{ list.number.length <= 13 ? list.psn_cash_money.toFixed(2) : (totalPrice - list.psn_cash_money).toFixed(2) }}</div>
             <div style="position: absolute;top:110px;left:540px;">现金</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
@@ -99,7 +99,7 @@
                 </span>
                 <span v-else>零</span>
             </span>
-            <span  style="position: absolute;top:235px;left:280px">
+            <span  style="position: absolute;top:235px;left:290px">
                 <span v-if="zhongwen.indexOf('佰') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
                 </span>
@@ -143,6 +143,7 @@
 
 <script>
 import { getInvoice } from '@/api/project/project'
+import { uParseTime } from '@/utils/tools'
 export default {
     props:{
         paramsObj:Object
@@ -231,7 +232,15 @@ export default {
             this.zhongwen =  str.replace(/零(仟|佰|拾|角)/g, "零").replace(/(零)+/g, "零").replace(/零(万|亿|元)/g, "$1").replace(/(亿)万|壹(拾)/g, "$1$2").replace(/^元零?|零分/g, "").replace(/元$/g, "元整");
             console.log(this.zhongwen)
         },
-
+        getTime(value, temp) {
+            if (value == 0) {
+                return ''
+            }
+            if (value != undefined) {
+                return uParseTime(value, temp)
+            }
+            return ''
+        },
     },
     watch:{
         paramsObj:{//深度监听，可监听到对象、数组的变化

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -79,7 +79,7 @@ export default {
       this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
 
 
-      if(this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 0 || this.$store.getters.xt_user.org_id == 4){
+      if(this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 0 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 10278){
         setTimeout(() => {
           const style =
           '@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 47%;}}}';

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -129,7 +129,12 @@
                                                 <template slot-scope="scope">{{ scope.row.drug_name }}</template>
                                             </el-table-column>
                                             <el-table-column label="规格" width="60">
-                                                <template slot-scope="scope">{{ scope.row.drug_spec }}</template>
+                                                <template slot-scope="scope">
+                                                  <!-- {{ scope.row.drug_spec }} -->
+                                                   <span
+                                                       v-if="scope.row.min_unit != scope.row.dose_unit">{{ scope.row.dose }}{{ scope.row.dose_unit }}&nbsp;* &nbsp;</span>
+                                                       {{ scope.row.min_number }}{{ scope.row.min_unit }}/{{ scope.row.max_unit }}
+                                                  </template>
                                             </el-table-column>
                                             <el-table-column label="单价" width="40">
                                                 <template slot-scope="scope">{{ scope.row.retail_price }}</template>

src/xt_pages/qcd/treatmentControlAnalysis/components/CheckAll.vue

@@ -264,7 +264,7 @@ export default {
               }
               this.tableData.push({ name: key, data: dd[key]});
             }
-            console.log("表哥",this.tableData)
+       
             let projectArr = []
           
             this.newArr.map(item => {

src/xt_pages/role/admin.vue

@@ -44,6 +44,12 @@
           min-width="160"
           align="center"
         ></el-table-column>
+        <el-table-column label="医保医师编码" prop="doctor_number" min-width="160" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.doctor_number== 0"></span>
+            <span v-if="scope.row.doctor_number!= 0">{{scope.row.doctor_number}}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           label="最后登录IP"
           prop="ip"

src/xt_pages/role/components/AdminInfoForm.vue

@@ -68,6 +68,13 @@
       </el-form-item>
     </el-col>
    </el-row>
+   <el-row :span="24">
+      <el-col :span="8">
+       <el-form-item label="医保医师编码:">
+        <el-input v-model="form.doctor_number"></el-input>
+       </el-form-item>
+    </el-col>
+   </el-row>
   
   <div v-show="show">
    <el-row :span="24">
@@ -343,12 +350,7 @@
 
 
   <el-row :gutter="24">
-    <el-col :span="8">
-       <el-form-item label="医保医师编码:">
-         
-        <el-input v-model="form.doctor_number"></el-input>
-       </el-form-item>
-    </el-col>
+   
      <el-col :span="8">
        <el-form-item label="门诊大病类别:" label-width="130px">
             <el-select v-model="form.outpatient_illnessCategory" placeholder="门诊大病类别">
@@ -1063,8 +1065,6 @@
         })
       },
       changeRole(arr){
-        console.log("arr",arr)
-        console.log("roles",this.roles)
         var varName = []
         for(let i=0;i<this.roles.length;i++){
           for(let j=0;j<arr.length;j++){
@@ -1073,7 +1073,6 @@
              }
           }
         }
-        console.log("33333",varName)
         this.form.role_type = 1
         var ids = varName.join(";")
         console.log("valee22222",ids)

src/xt_pages/stock/cancelStockOrder.vue

@@ -186,6 +186,12 @@
             </template>
           </el-table-column>
 
+           <el-table-column label="国家编码" align="center">
+            <template slot-scope="scope">
+              {{scope.row.GoodInfo.social_security_directory_code}}
+            </template>
+          </el-table-column>
+
           <el-table-column label="退库数量" align="center">
             <template slot-scope="scope">
               {{ scope.row.count}}{{scope.row.GoodInfo.packing_unit}}

src/xt_pages/stock/drugs/cancelDrugStockOrder.vue

@@ -182,7 +182,11 @@
                 {{ scope.row.BaseDrugLib.dose}}{{scope.row.BaseDrugLib.dose_unit}} * {{scope.row.BaseDrugLib.min_number}}{{scope.row.BaseDrugLib.min_unit}} /{{scope.row.BaseDrugLib.max_unit}}
               </template>
             </el-table-column>
-          
+            <el-table-column label="国家编码" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.BaseDrugLib.medical_insurance_number}}
+              </template>
+            </el-table-column>
             <el-table-column label="退库数量" align="center">
               <template slot-scope="scope">
                 {{ scope.row.count}}

src/xt_pages/stock/drugs/drugBatchNumber.vue

@@ -79,6 +79,11 @@
              {{scope.row.warehousing_count}}{{scope.row.max_unit}}
            </template>
         </el-table-column>
+        <el-table-column prop="drug_name" label="零售价" align="center">
+           <template slot-scope="scope">
+              {{scope.row.retail_price}}
+           </template>
+        </el-table-column>
         <el-table-column prop="drug_name" label="进货单价" align="center">
            <template slot-scope="scope">
               {{scope.row.price}}

src/xt_pages/stock/drugs/drugQueryPrint.vue

@@ -18,6 +18,7 @@
               <td style="line-height: 50px" width="100">药品类型</td>
               <td style="line-height: 50px" width="150">药品名称</td>
               <td style="line-height: 50px" width="150">规格型号&单位</td>
+              <td style="line-height: 50px" width="150">国家编码</td>
               <td style="line-height: 50px" width="100">进货单价</td>
               <td  style="line-height: 50px" width="200">厂家</td>
               <td style="line-height: 50px" width="80">入库数量</td>
@@ -38,7 +39,9 @@
               <td style="line-height: 50px">
                    <span> {{item.dose + item.dose_unit +"*"+item.min_number+item.min_unit+"/"+item.max_unit}}</span>
               </td>
-             
+             <td style="line-height: 50px">
+                  <span>{{item.medical_insurance_number }}</span>
+              </td>
               <td style="line-height: 50px">
                   <span>{{item.last_price }}</span>
               </td>

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -189,6 +189,11 @@
           <template slot-scope="scope">
             {{scope.row.drug.dose}}&nbsp;{{scope.row.drug.dose_unit}}*{{scope.row.drug.min_number}}{{scope.row.drug.min_unit}}/{{scope.row.drug.max_unit}}
           </template>
+        </el-table-column>
+          <el-table-column label="国家编码" align="center">
+          <template slot-scope="scope">
+            {{scope.row.drug.medical_insurance_number}}
+          </template>
         </el-table-column>
         <el-table-column label="批号" align="center">
           <template slot-scope="scope">

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -211,7 +211,11 @@
               {{scope.row.dose}} {{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
             </template>
           </el-table-column>
-         
+          <el-table-column label="国家编码" align="center">
+            <template slot-scope="scope">
+              {{scope.row.medical_insurance_number}}
+            </template>
+          </el-table-column>
           <el-table-column label="出库数量" align="center">
             <template slot-scope="scope">
               <!-- <span v-if="scope.row.is_sys ==  0">{{getTotalCount(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}</span> -->
@@ -223,11 +227,11 @@
               {{scope.row.price}}
             </template>
           </el-table-column>
-          <el-table-column label="拆零零售价" align="center">
+          <!-- <el-table-column label="拆零零售价" align="center">
             <template slot-scope="scope">
-              {{scope.row.min_price}}
+              {{scope.row.retail_price}}
             </template>
-          </el-table-column>
+          </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>
@@ -1188,7 +1192,7 @@ export default {
           }
         }
         const tHeader = ['药品名称','药品类型','规格&单位', '批号','出库数量','出货单价','拆零零售价','总价','生产厂家','生产日期','有效日期','经销商','批准文号','备注']
-        const filterVal = ['drug_name','drug_type','unit','batch_number', 'count','price','min_price','total_price','manufacturer','product_date','expiry_date','dealer','number','remark']
+        const filterVal = ['drug_name','drug_type','unit','batch_number', 'count','price','retail_price','total_price','manufacturer','product_date','expiry_date','dealer','number','remark']
 
         // console.log("table",this.exportList)
          
@@ -1212,7 +1216,7 @@ export default {
               total += this.drugFlowList[i].count
           }
         }
-        all_price = total * min_price
+        all_price = total * price
       
         return  all_price
       },

src/xt_pages/stock/drugs/inventory.vue

@@ -72,7 +72,7 @@
              <el-table-column prop="name" label="盘点后数量" width="180"  align="center">
                 <template slot-scope="scope">
                   <el-input style="width:50px" v-model="scope.row.last_stock_max_number"></el-input>{{scope.row.max_unit}}
-                 <span v-if="scope.row.XtBaseDrug.max_unit!=scope.row.XtBaseDrug.min_unit"><el-input style="width:50px" v-model="scope.row.last_stock_min_number" :disabled="true"></el-input>{{scope.row.min_unit}}</span> 
+                 <span v-if="scope.row.XtBaseDrug.max_unit!=scope.row.XtBaseDrug.min_unit"><el-input style="width:50px" v-model="scope.row.last_stock_min_number"></el-input>{{scope.row.min_unit}}</span> 
                  </template> 
               </el-table-column>
 

src/xt_pages/stock/drugs/query.vue

@@ -94,6 +94,11 @@
            <template slot-scope="scope">
              {{scope.row.dose + scope.row.dose_unit +"*"+scope.row.min_number+scope.row.min_unit+"/"+scope.row.max_unit}}
            </template>
+        </el-table-column>
+        <el-table-column prop="drug_name" label="国家编码" align="center">
+           <template slot-scope="scope">
+             {{scope.row.medical_insurance_number}}
+           </template>
         </el-table-column>
          <el-table-column prop="drug_name" label="进货单价" align="center">
            <template slot-scope="scope">
@@ -482,8 +487,8 @@ import { min } from 'moment'
           }   
          }
          import('@/vendor/Export2Excel').then(excel => {
-         const tHeader = ['序号', '药品类型', '药品名称','规格型号&单位','进货单价','厂家','入库数量','出库数量','剩余库存量']
-         const filterVal = ['index', 'drug_type_name', 'drug_name','unit','last_price','manufacturer_name','inCount','outCount','overplusCount']
+         const tHeader = ['序号', '药品类型', '药品名称','规格型号&单位','国家编码','进货单价','厂家','入库数量','出库数量','剩余库存量']
+         const filterVal = ['index', 'drug_type_name', 'drug_name','unit','medical_insurance_number','last_price','manufacturer_name','inCount','outCount','overplusCount']
 
 
          const data = this.formatJson(filterVal, this.tableList)

src/xt_pages/stock/inventory.vue

@@ -100,7 +100,7 @@
           v-model="form.drug_name"
           :fetch-suggestions="querySearchAsync"
           :trigger-on-focus="true"
-          placeholder="请输入药品名称"
+          placeholder="请输入耗材名称"
           @select="handleSelect"
           style="width:300px;"
           v-show="showTableOne"

src/xt_pages/stock/stockBatchNumber.vue

@@ -38,18 +38,7 @@
               value-format="yyyy-MM-dd"
               @change="endTimeChange"
           ></el-date-picker>
-
-        <!-- <span>出入库方式:</span>
-        <el-select v-model="stock_type" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
-            <el-option
-              v-for="(item,index) in stockType"
-              :key="index"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-        </el-select> -->
-        
-        
+  
       </div>
       
        <el-table
@@ -93,6 +82,11 @@
              <span> {{scope.row.price}}</span>
            </template>
         </el-table-column>
+         <el-table-column prop="drug_name" label="零售价" align="center">
+           <template slot-scope="scope">
+             <span v-if="scope.row.packing_price > 0"> {{scope.row.packing_price}}</span>
+           </template>
+        </el-table-column>
        </el-table>
        
       <el-pagination

src/xt_pages/stock/stockInOrder.vue

@@ -193,6 +193,11 @@
             {{ scope.row.GoodInfo.specification_name}} / {{scope.row.GoodInfo.packing_unit}}
           </template>
         </el-table-column>
+        <el-table-column label="国家编码" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.GoodInfo.social_security_directory_code}}
+          </template>
+        </el-table-column>
         <el-table-column label="批号" align="center">
           <template slot-scope="scope">
             {{ scope.row.number}}
@@ -203,6 +208,11 @@
             {{ scope.row.warehousing_count}}{{scope.row.GoodInfo.packing_unit}}
           </template>
         </el-table-column>
+         <!-- <el-table-column label="零售价" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.packing_price}}
+          </template>
+        </el-table-column> -->
         <el-table-column label="进货价" align="center">
           <template slot-scope="scope">
             {{ scope.row.price}}

src/xt_pages/stock/stockInOrderAdd.vue

@@ -107,7 +107,21 @@
             
             </template>
           </el-table-column>
+        
+          <el-table-column align="center" width="120">
+            <template slot="header" slot-scope="scope">
+              <span>零售价<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+            
+              <el-form-item :prop="'recordData.' + scope.$index + '.packing_price'" :rules='tableRules.packing_price'
+                            style="padding-top: 20px">
+                <el-input placeholder="请输入单价" type="number" v-model="scope.row.packing_price"></el-input>
+              </el-form-item>
 
+
+            </template>
+          </el-table-column>
           <el-table-column align="center" width="120">
             <template slot="header" slot-scope="scope">
               <span>进货单价<span style="color: red">*</span></span>
@@ -285,6 +299,9 @@
           price: [
             { required: true, message: '单价不能为空', trigger: 'blur' }
           ],
+          packing_price: [
+            { required: true, message: '零售价不能为空', trigger: 'blur' }
+          ],
           warehousing_count: [
             { required: true, message: '数量不能为空', trigge: 'blur' }
           ],
@@ -511,6 +528,7 @@
         tempObj['specification_name'] = ''
         tempObj['name'] = ''
         tempObj['license_number'] = ""
+        tempObj["packing_price"] = ""
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (this.recordInfo.recordData.length <= 1) {
@@ -642,6 +660,7 @@
       }
       ,
       submit() {
+        console.log("res23322332",this.$refs)
         this.$refs['tableForm'].validate((valid) => {
           if (valid) {
             const array = this.recordInfo.recordData
@@ -652,6 +671,7 @@
                 return
               }
               array[i].price = array[i].price.toString()
+              array[i].packing_price = array[i].packing_price.toString()
             }
 
             if(this.recordInfo.recordData.length <= 0){
@@ -755,6 +775,7 @@
         this.currentIndex = val
       },
       handleSelect(val){
+         console.log("val3232232323",val)
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(this.currentIndex == i){
               this.recordInfo.recordData[i].good_type_id = val.id
@@ -764,11 +785,18 @@
               this.recordInfo.recordData[i].number =  val.number
               this.recordInfo.recordData[i].manufacturer = val.manufacturer
               this.recordInfo.recordData[i].remark = val.remark
+           
               if(val.buy_price == 0){
                this.recordInfo.recordData[i].price = ""
               }else{
                 this.recordInfo.recordData[i].price = val.buy_price
               }
+
+              if(val.packing_price == 0){
+               this.recordInfo.recordData[i].packing_price = ""
+              }else{
+                this.recordInfo.recordData[i].packing_price = val.packing_price
+              }
               
               this.recordInfo.recordData[i].specification_name = val.specification_name
               this.recordInfo.recordData[i].good_id = val.id
@@ -811,6 +839,7 @@
       tempObj['specification_name'] = ''
       tempObj['name'] = ''
       tempObj['license_number'] = ''
+      tempObj['packing_price']= ''
       this.recordInfo.recordData.push(tempObj)
       this.GetConfigInfo()
       this.propForm.goodUnit = this.$store.getters.good_unit

src/xt_pages/stock/stockInOrderEdit.vue

@@ -122,10 +122,23 @@
               </el-form-item>
             </template>
           </el-table-column>
+          <el-table-column align="center" width="120">
+            <template slot="header" slot-scope="scope">
+              <span>零售价<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+            
+              <el-form-item :prop="'recordData.' + scope.$index + '.packing_price'" :rules='tableRules.packing_price'
+                            style="padding-top: 20px">
+                <el-input placeholder="请输入单价" type="number" v-model="scope.row.packing_price"></el-input>
+              </el-form-item>
+
 
+            </template>
+          </el-table-column>
           <el-table-column align="center" width="120">
             <template slot="header" slot-scope="scope">
-              <span>单价<span style="color: red">*</span></span>
+              <span>进货价<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
               <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
@@ -340,6 +353,9 @@ export default {
       },
       tableRules: {
         price: [{ required: true, message: "单价不能为空", trigger: "blur" }],
+        packing_price: [
+          { required: true, message: '零售价不能为空', trigger: 'blur' }
+        ],
         warehousing_count: [
           { required: true, message: "数量不能为空", trigge: "blur" }
         ],
@@ -482,6 +498,7 @@ export default {
       tempObj["dealer"] = "";
       tempObj["manufacturer"] = "";
       tempObj["license_number"] = ""
+      tempObj["packing_price"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -608,6 +625,7 @@ export default {
          
           for(let i=0;i<this.recordInfo.recordData.length;i++){
             this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
+             this.recordInfo.recordData[i].packing_price = this.recordInfo.recordData[i].packing_price.toString()
              if(this.recordInfo.recordData[i].dealer == ""){
                 this.recordInfo.recordData[i].dealer = 0
              }

src/xt_pages/stock/stockOutOrder.vue

@@ -191,6 +191,12 @@
               {{ scope.row.specification_name}} / {{scope.row.packing_unit}}
             </template>
           </el-table-column>
+
+          <el-table-column label="国家编码" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.social_security_directory_code}}
+            </template>
+          </el-table-column>
          
           <el-table-column label="出库数量" align="center">
             <template slot-scope="scope">

src/xt_pages/stock/stockPrint.vue

@@ -27,6 +27,7 @@
                                     <td width="80">耗材类型</td>
                                     <td width="80">耗材名称</td>
                                     <td width="80">规格&单位</td>
+                                    <td width="80">国家编码</td>
                                     <td width="80">进货单价</td>
                                     <td width="80">生产商</td>
                                     <td width="80">入库数量</td>
@@ -39,6 +40,7 @@
                                    <td>{{getGoodType(item.good_type_id)}}</td>
                                    <td>{{item.good_name }}</td>
                                    <td><span>{{item.specification_name }} / {{item.packing_unit}}</span></td>
+                                   <td>{{item.social_security_directory_code}}</td>
                                    <td>{{item.buy_price}}</td>
                                    <td>{{getManufacture(item.manufacturer)}}</td>
                                    <td>

src/xt_pages/stock/stockQuery.vue

@@ -91,6 +91,11 @@
               <span>{{ scope.row.specification_name }} / {{scope.row.packing_unit}}</span>
             </template>
          </el-table-column>
+         <el-table-column label="国家编码" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.social_security_directory_code}}</span>
+            </template>
+         </el-table-column>
         <el-table-column label="进货单价" align="center">
           <template slot-scope="scope">
              {{scope.row.buy_price}}
@@ -353,8 +358,8 @@ export default {
     exportList(){
          import('@/vendor/Export2Excel').then(excel => {
 
-         const tHeader = ['耗材类型', '耗材名称', '规格&单位','进货单价','生产商','入库数量','出库数量','库存剩余量']
-         const filterVal = ['type_name', 'good_name', 'unit','buy_price','prodect_name','inCount','outCount','overplus']
+         const tHeader = ['耗材类型', '耗材名称', '规格&单位','国家编码','进货单价','生产商','入库数量','出库数量','库存剩余量']
+         const filterVal = ['type_name', 'good_name', 'unit','social_security_directory_code','buy_price','prodect_name','inCount','outCount','overplus']
 
 
          for(let i=0;i<this.tableList.length;i++){

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -3,9 +3,10 @@
 <div class="position">
     <bread-crumb :crumbs="crumbs"></bread-crumb>
 </div>
-<div class="app-container ">
+<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
@@ -15,6 +16,7 @@
             :value="item.id">
         </el-option>
         </el-select>
+        <span>单据日期:</span>
         <el-date-picker
         size="small"
         v-model="start_time"
@@ -27,7 +29,8 @@
         format="yyyy-MM-dd"
         value-format="yyyy-MM-dd"
         @change="startTimeChange"
-        ></el-date-picker>-
+        ></el-date-picker>
+        <span>交货日期:</span>
         <el-date-picker
             size="small"
             v-model="end_time"
@@ -41,53 +44,51 @@
             value-format="yyyy-MM-dd"
             @change="endTimeChange"
         ></el-date-picker>
-        <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
-        >
+        <span>单据编码:{{number}}</span>
+
     </div>
     <div>
-        <el-button size="small" type="primary" @click="savePurchaseOrder">保存</el-button>
+        <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="updatePurchaseOrder" v-show="showOne">修改</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="tableList"
+    :data="recordInfo.tableList"
     :class="signAndWeighBoxPatients"
     border
     style="width: 100%"
     max-height="450"
     >
-    <el-table-column label="商品" align="center" width="200px">
+    <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)">
-            <el-option
-                v-for="(item,index) in tabList"
-                :key="index"
-                :label="item.supply_name"
-                :value="item">
-            </el-option>
-            </el-select>
+                <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 label="商品类别" align="center" width="150px">
+    <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>
@@ -103,8 +104,13 @@
         </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-input v-model="scope.row.supply_count" style="width:80px"></el-input>
+          <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-form-item>
         </template>
     </el-table-column>
 
@@ -119,13 +125,13 @@
           {{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">
@@ -161,15 +167,24 @@
         </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>
 </div>
 </template>
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-
-import {getInitOrder} from "@/api/supply"
+import {uParseTime } from '@/utils/tools'
+import {getInitOrder,savePurchaseOrder,updatePurchaseOrder} from "@/api/supply"
 export default {
 name: "addPurchaseOrder",
 created() {
@@ -193,9 +208,14 @@ BreadCrumb
 data() {
 return {
     crumbs: [
-    { path: false, name: "购货订单" },
-    { path: "/spply/query", name: "新增购货订单" }
+       { path: false, name: "购货订单" },
+       { path: "/spply/query", name: "新增购货订单" }
     ],
+    showTwo:true,
+    showOne:false,
+    recordInfo: {
+      tableList:[],
+    },
     keywords: "",
     total: 0,
     multipleSelection: [],
@@ -208,7 +228,6 @@ return {
     goodInfo: [],
     org_id:0,
     types:[],
-    tableList:[],
     tyep_name:"",
     form:{
     manufacturer_id:"",
@@ -220,9 +239,24 @@ return {
     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,
+  };
 },
 methods:{
+
 getInitOrder(){
     getInitOrder().then(response=>{
     if(response.data.state == 1){
@@ -234,12 +268,12 @@ getInitOrder(){
        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
@@ -260,19 +294,19 @@ getInitOrder(){
 
         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
@@ -283,39 +317,45 @@ getInitOrder(){
         goodList[i].supply_manufacturer = goodList[i].manufacturer
         goodList[i].supply_license_number = ""
         goodList[i].supply_remake = ""
-        goodList[i].type = 2   
+        goodList[i].type = 2
         goodList[i].name = goodList[i].good_name
 
-        this.tabList.push(goodList[i]) 
+        this.tabList.push(goodList[i])
         }
-    }
-    })  
+        this.goodList = goodList
+    } 
+    })
 },
 changeGoodName(val){
-    console.log("9媚23323232",val)  
-    this.currentIndex = val
+  this.currentIndex = val
 },
 changeName(val){
-    console.log("val23322323",val)
-    
-    for(let i=0;i<this.tableList.length;i++){
+    //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.tableList[i].id = val.id
-        this.tableList[i].type = val.type
-        this.tableList[i].name = val.name
-        this.tableList[i].supply_name = val.supply_name
-        this.tableList[i].supply_type = val.supply_type
-        this.tableList[i].supply_specification_name = val.supply_specification_name
-        this.tableList[i].supply_total = val.supply_total
-        this.tableList[i].supply_count = val.supply_count
-        this.tableList[i].supply_price = val.supply_price
-        this.tableList[i].supply_total_price = val.supply_total_price
-        this.tableList[i].supply_manufacturer = val.supply_manufacturer
-        this.tableList[i].supply_license_number = val.supply_license_number
-        this.tableList[i].supply_remake = val.supply_remake
-    }
+        this.recordInfo.tableList[i].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
+     }
     }
-    console.log("表哥332322332232323",this.tableList)
+   
+
 },
 handleEdit(){
     const tempObj = {}
@@ -324,31 +364,99 @@ handleEdit(){
     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_total'] = ""
+    tempObj['supply_count'] = ""
+    tempObj['supply_price'] = ""
+    tempObj['supply_total_price'] = ""
     tempObj['supply_manufacturer'] = ''
     tempObj['supply_license_number'] = ''
     tempObj['supply_remake'] = ''
     tempObj['type'] = 0
-    this.tableList.push(tempObj)  
+    tempObj['is_total'] = 1
+    this.recordInfo.tableList.push(tempObj)
 },
 handleDelete: function(index, row) {
-  if (this.tableList.length <= 1) {
+  if (this.recordInfo.tableList.length <= 1) {
         this.$message.error('只有一条记录的时候无法删除')
         return
    } else {
-        this.tableList.splice(index, 1)
+        this.recordInfo.tableList.splice(index, 1)
    }
 },
+
+
 savePurchaseOrder(){
-    console.log("param323322332",this.tableList)
-    savePurchaseOrder().then(response=>{
+    this.loading = true
+    if(this.supplier_name == 0 || this.supplier_name == ""){
+       this.$message.error("供应商不能为空!")
+       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()
+            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
+         }
+       
+        savePurchaseOrder(params,this.supplier_name,start,end,this.rate_of_concession,this.discount_amount).then(response=>{
+            if(response.data.state == 1){
+                var order =  response.data.data.order
+                this.loading = false
+                this.$message.success("保存成功!")
+                var warehouseInfo = response.data.data.warehouseInfo
+                this.number  = warehouseInfo.number
+                this.id = warehouseInfo.id
+                this.recordInfo.tableList = []
+                var orderInfo = response.data.data.orderInfo
+                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
+                }
+                console.log("orderINFO23323232",orderInfo)
+                this.recordInfo.tableList = orderInfo
+                // for(let i=0;i<orderInfo.length;i++){
+                //    orderInfo[i].name = "" 
+                //    orderInfo[i].supply_name = ""
+                //    orderInfo[i].supply_specification_name = ""
+                //   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].name = this.drugList[j].drug_name
+                //        }
+                //     }
+                //   }
+                //   if(orderInfo[i].is_source == 2){
+                //     for(let y=0;y<this.goodList.length;y++){
+                //        if(orderInfo[i].project_id = this.goodList[y].id){
+                //           orderInfo[i].name = this.goodList[y].good_name
+                //        }
+                //     }
+                //   }
+                // }
+                this.showTwo = false
+                this.showOne = true
+            }
+        })
+      }
+
+   })
 
-    })  
 },
 
+
 changeTypeName(){
 
 },
@@ -359,7 +467,7 @@ endTimeChange(){
 
 },
 search(){
-    
+
 },
 
 getWarehoseInfo(arr,max_unit,min_unit,min_number){
@@ -387,7 +495,7 @@ getWarehoseInfo(arr,max_unit,min_unit,min_number){
     }
   }
  return max_str + min_str
- }, 
+ },
 getTotalStockCount(arr){
   var total_count = 0
   for(let i=0;i<arr.length;i++){
@@ -404,6 +512,47 @@ calculate: function(val) {
     }
     return Math.round(parseFloat(val) * 100) / 100;
   },
+getTimes(time) {
+    if (time === '') {
+    return ''
+    }
+    return uParseTime(time, '{y}-{m}-{d}')
+},
+ updatePurchaseOrder(){
+   this.$refs.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()
+           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
+         }
+        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){
+             var warehousingInfo =  response.data.data.warehousingInfo
+             this.$message.success("修改成功!")
+           }
+        })
+      } 
+   })
+ },
+ 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)
+ }
 },
 created(){
     const tempObj = {}
@@ -412,16 +561,17 @@ created(){
     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_total'] = ""
+    tempObj['supply_count'] = ""
+    tempObj['supply_price'] = ""
+    tempObj['supply_total_price'] = ""
     tempObj['supply_manufacturer'] = ''
     tempObj['supply_license_number'] = ''
     tempObj['supply_remake'] = ''
     tempObj['type'] = 0
-    this.tableList.push(tempObj)  
-    this.getInitOrder()  
+    tempObj['is_total'] = 1
+    this.recordInfo.tableList.push(tempObj)
+    this.getInitOrder()
 }
 };
 </script>
@@ -478,7 +628,7 @@ background-color: #d0d3da;
 }
 .el-table__fixed-right{
   width:150px;
-  bottom: 20px; 
-  height: 200px; 
+  bottom: 20px;
+  height: 200px;
 }
 </style>

src/xt_pages/supply/purchaseOrderQuery.vue

@@ -6,15 +6,7 @@
     <div class="app-container ">
       <div style="justify-content: space-between;margin: 0px 0 12px 0;display: flex;align-items: center;">
         <div>
-          <el-select v-model="type_name" style="width:140px;margin-right:10px;" placeholder="请选择"
-          @change="changeTypeName">
-            <el-option
-              v-for="item in types"
-              :key="item.id"
-              :label="item.type_name"
-              :value="item.id">
-            </el-option>
-          </el-select>
+        
           <el-date-picker
             size="small"
             v-model="start_time"
@@ -41,12 +33,22 @@
               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="耗材名称"
+            placeholder="订单编号或供应商名称"
           />
           <el-button
             size="small"
@@ -75,17 +77,17 @@
       >
         <el-table-column label="订单日期" align="center">
           <template slot-scope="scope">
-            <span></span>
+            <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></span>
+              <span>{{getName(scope.row.supplier_id)}}</span>
             </template>
          </el-table-column>
         <el-table-column label="关联购货订单" align="center">
@@ -95,39 +97,39 @@
         </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">
-         
-        
+           <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">
-         
+           {{getTimes(scope.row.delivery_date)}}
          </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>
 
@@ -161,35 +163,20 @@
       >
       </el-pagination>
 
-       <add-supply ref="addSupply"></add-supply>
     </div>
   </div>
 </template>
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import addSupply from "./components/addSupply.vue"
 
+import {getAllSupply,getAllPurchaseOrderList} from "@/api/supply"
+import {uParseTime } from '@/utils/tools'
 export default {
   name: "stockIn",
    components: {
-     addSupply
+     
    },
-  created() {
-    this.org_id =  this.$store.getters.xt_user.org_id
-
-    var start_time =  window.sessionStorage.getItem('start_time')
-    var end_time =  window.sessionStorage.getItem('end_time')
-
-    if(start_time !=null){
-      this.start_time = start_time
-    }
-    if(end_time!=null){
-      this.end_time = end_time
-    }
-    window.sessionStorage.removeItem('start_time')
-    window.sessionStorage.removeItem('end_time')
-  },
   components: {
     BreadCrumb
   },
@@ -204,7 +191,7 @@ export default {
       multipleSelection: [],
       signAndWeighBoxPatients: "sign-and-weigh-box-patients",
       start_time: "",
-      end_time: "",
+      end_time:new Date(),
       page: 1,
       limit: 10,
       goodType: [],
@@ -212,15 +199,129 @@ export default {
       org_id:0,
       types:[],
       tableList:[],
-      tyep_name:"",
+      type_name:"",
+      checkList:[
+        {id:0,name:"请选择"},
+        {id:1,name:"已审核"},
+        {id:2,name:"未审核"},
+      ],
+      supplyList:[],
+      check_id:0,
+      doctorList:[],
     };
   },
   methods:{
      toAdd(){
-       console.log("res32323232323223",this.$refs)  
-       this.$refs.addSupply.show()  
+       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
      } 
-  }
+  },
+  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>
 

src/xt_pages/supply/supplyQuery.vue

@@ -103,7 +103,7 @@
            
          </template>
        </el-table-column>
-       <el-table-column label="开户银行" align="center" v-if="showOne">
+       <el-table-column label="开户银行" align="center">
          <template slot-scope="scope">
          
           </span>
@@ -111,14 +111,14 @@
          </template>
        </el-table-column>
       
-        <el-table-column label="纳税人识别号" align="center" v-if="showThree">
+        <el-table-column label="纳税人识别号" align="center" >
          <template slot-scope="scope">
          
          </template>
        </el-table-column>
         
     
-      <el-table-column label="手机" align="center" v-if="showFour">
+      <el-table-column label="手机" align="center">
          <template slot-scope="scope">
        
          </template>
@@ -214,7 +214,25 @@ export default {
      toAdd(){
        console.log("res32323232323223",this.$refs)  
        this.$refs.addSupply.show()  
-     } 
+     },
+      changeTypeName(){
+
+     }, 
+     startTimeChange(){
+
+     },
+     endTimeChange(){
+
+     },
+     search(){
+
+     },
+     handleSizeChange(){
+
+     },
+     handleCurrentChange(){
+       
+     }
   }
 };
 </script>

src/xt_pages/workforce/components/tableData.vue

@@ -86,8 +86,37 @@
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="300">
+          
+           <template slot-scope="scope">
+            <span v-if="now_time>scope.row.schedule_date">
+              <el-button
+                size="mini"
+                type="primary"
+                :disable="true"
+              >
+                取消排班
+              </el-button>
+              <el-button
+                size="mini"
+                type="primary"
+                :disable="true"
+              >
+                调整机号
+              </el-button>
+              <el-button
+                size="mini"
+                type="primary"
+              :disable="true"
+              >
+                调整模式
+              </el-button>
+           </span>
+          </template>
+         
+         
           <template slot-scope="scope">
-            <el-button
+            <span v-if="now_time <=scope.row.schedule_date">
+              <el-button
               size="mini"
               type="primary"
               @click="CancelSchedule(scope.row.id)"
@@ -108,6 +137,8 @@
             >
               调整模式
             </el-button>
+            </span>
+           
           </template>
         </el-table-column>
       </el-table>
@@ -774,7 +805,8 @@ export default {
       },
       zoneIdList:[],
       strArr:"",
-      patient_id_hover:0
+      patient_id_hover:0,
+      now_time:"",
     };
   },
 
@@ -2307,7 +2339,21 @@ export default {
   //    this.tableContainHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 160
   // },
   created() {
-    
+    var date = new Date()
+    this.time = date
+    var year = date.getFullYear()
+    var month = date.getMonth() + 1
+    if (month < 10) {
+      month = "0" + month
+    }
+    var day = date.getDate()
+    if (day < 10) {
+      day = "0" + day
+    }
+    var nowDate = year + "-" + month + "-" + day
+    var date = new Date(nowDate + " 00:00:00")
+    console.log("date23232323232323",date.getTime()/1000) 
+    this.now_time = date.getTime()/1000
     this.getAllZones()
  
     this.changeScheduleType(1)