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

@@ -9,10 +9,49 @@ export function getInitOrder(params) {
 }
 
 export function savePurchaseOrder(data, supplier_name, start_time, end_time, rate_of_concession, discount_amount) {
-  console.log('data32323323232', data)
   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
+  })
+}
+
+export function checkPurchaseOrder(id, params) {
+  return request({
+    url: '/api/supply/checkpurchaseorder?id=' + id,
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getPurchaseOrderDetail(id, params) {
+  return request({
+    url: '/api/supply/getpurchaseorderdetail?id=' + id,
+    method: 'get',
+    params: params
+  })
+}

src/lang/zh.js

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

src/router/modules/supply.js

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

src/xt_pages/data/components/addDrugs.vue

@@ -267,6 +267,10 @@
                             <el-input v-model="form.medical_insurance_number" style="width:160px;" placeholder=""
                                       maxlength="30"></el-input>
                         </el-form-item>
+                      <el-form-item label="省编码 : " prop="provinces_code">
+                        <el-input v-model="form.provinces_code" style="width:160px;" placeholder=""
+                                  maxlength="30"></el-input>
+                      </el-form-item>
                         <el-form-item label="生产厂商 : " prop="manufacturer">
 
                             <el-select v-model="form.manufacturer" style="width:160px;" filterable placeholder="请选择">
@@ -543,6 +547,7 @@
           drug_dose: '',//药品剂量
           drug_dose_unit: '',
           medical_insurance_number: '',//医保编号
+          provinces_code:"",//省编码
           manufacturer: '', //生产产商
           pharmacology_category: '',//药理分类
           statistics_category: '',//统计分类
@@ -851,6 +856,10 @@
         form['drug_dose'] = this.form.drug_dose
         form['drug_dose_unit'] = this.form.drug_dose_unit
         form['medical_insurance_number'] = this.form.medical_insurance_number
+        form['provinces_code'] = this.form.provinces_code
+
+
+
         form['manufacturer'] = this.form.manufacturer
         form['pharmacology_category'] = this.form.pharmacology_category
         form['statistics_category'] = this.form.statistics_category

src/xt_pages/data/components/addProject.vue

@@ -230,7 +230,7 @@
                             :value="item.value">
                             </el-option>
                         </el-select>
-                    </el-form-item>       
+                    </el-form-item>
                 </el-form>
             </el-tab-pane>
         </el-tabs>
@@ -259,8 +259,8 @@ export default {
             form:{
               project_name:"",
               pinyin:"",
-              wubi:"", 
-              price:"", 
+              wubi:"",
+              price:"",
               unit:"",
               cost_classify:"",
               executive_section:"",

src/xt_pages/data/components/consumables.vue

@@ -307,6 +307,8 @@
               good_unit:'',
               retail_price:'',
               medical_insurance_number:'',
+              provinces_code:'',
+
               is_special_diseases:'',
               is_record:'',
               statistics_category:'',
@@ -598,6 +600,9 @@
             this.goodInfo.goodInfoDialog.formValue.medical_insurance_number =
               response.data.data.goodInfo.medical_insurance_number;
 
+            this.goodInfo.goodInfoDialog.formValue.provinces_code =
+                response.data.data.goodInfo.provinces_code;
+
 
             if (response.data.data.goodInfo.is_special_diseases <= 0) {
               this.goodInfo.goodInfoDialog.formValue.is_special_diseases = ''
@@ -810,7 +815,7 @@
         })
       },
       goodInfoDialogComfirm: function(val) {
-        
+
         if (val.isCreated == 2) {
           //修改
           val['id'] = this.goodInfo.editGoodId;
@@ -958,11 +963,11 @@
             this.$message.error(response.data.msg);
             return false
           } else {
-           
+
             for(let i=0;i<response.data.data.goodType.length;i++){
               this.goodTypeList.push(response.data.data.goodType[i])
             }
- 
+
             for (let i = 0; i < response.data.data.goodType.length; i++) {
               if (response.data.data.goodType[i].type == 1) {
                 response.data.data.goodType[i].type_name = response.data.data.goodType[i].type_name + '(系统设定)'
@@ -1036,6 +1041,8 @@
         this.goodInfo.goodInfoDialog.formValue.medical_insurance_level = '';
         this.goodInfo.goodInfoDialog.formValue.retail_price = '';
         this.goodInfo.goodInfoDialog.formValue.medical_insurance_number = '';
+        this.goodInfo.goodInfoDialog.formValue.provinces_code = '';
+
         this.goodInfo.goodInfoDialog.formValue.is_special_diseases = '';
         this.goodInfo.goodInfoDialog.formValue.is_record = '';
         this.goodInfo.goodInfoDialog.formValue.statistics_category = '';
@@ -1300,6 +1307,14 @@
               }
            }
 
+           if (results[i]['省编码'] === undefined) {
+             obj['provinces_code'] = ''
+           } else {
+             if (key == '省编码') {
+               obj['provinces_code'] = results[i][key].replace(/\s/g,"")
+             }
+           }
+
           if (results[i]['是否特病目录'] === undefined) {
                 obj['is_special_diseases'] = ''
               } else {
@@ -1498,7 +1513,7 @@
        getInitializtion().then(response=>{
          if(response.data.state == 1){
            var goodKindList = response.data.data.goodKindList;
-           
+
            this.goodKindList = goodKindList
            var medicalInsuranceLevelList =  response.data.data.medicalInsuranceLevelList
            console.log("医保等级",medicalInsuranceLevelList)
@@ -1509,7 +1524,7 @@
       exportList(){
         import('@/vendor/Export2Excel').then(excel => {
          console.log("this.table",this.goodInfo.goodInfoDialog.formValue.goodType)
-         
+
          for(let i=0;i<this.goodInfo.goodInfoData.length;i++){
            for(let j=0;j<this.goodKindList.length;j++){
               if(this.goodInfo.goodInfoData[i].good_kind == this.goodKindList[j].value){
@@ -1518,7 +1533,7 @@
            }
            for(let z=0;z<this.goodInfo.goodInfoDialog.formValue.goodType.length;z++){
               if(this.goodInfo.goodInfoData[i].good_type_id == this.goodInfo.goodInfoDialog.formValue.goodType[z].id){
-                
+
                  this.goodInfo.goodInfoData[i].good_type_name = this.goodInfo.goodInfoDialog.formValue.goodType[z].type_name
               }
            }
@@ -1534,27 +1549,27 @@
                 this.goodInfo.goodInfoData[i].manufacturer_name =  this.manufacturers[s].manufacturer_name
              }
            }
-          
+
           for(let a=0;a<this.dealers.length;a++){
              if(this.dealers[a].id == this.goodInfo.goodInfoData[i].dealer){
-                 this.goodInfo.goodInfoData[i].dealer_name = this.dealers[a].dealer_name 
-             } 
+                 this.goodInfo.goodInfoData[i].dealer_name = this.dealers[a].dealer_name
+             }
           }
          }
          console.log("hhhadhh233323232",this.goodInfo.goodInfoData)
-       
+
          const tHeader = ['耗材名称','耗材种类','耗材类型','医保等级','规格型号','生产厂商','单位','零价','库存警戒','经销商','最新进价','医保编码','社保目录编码']
-         const filterVal = ['good_name', 'good_kind_name','good_type_name','medical_insurance_level_name','specification_name','manufacturer_name','packing_unit','packing_price','stock_warn_count','dealer_name','buy_price','medical_insurance_number','social_security_directory_code'] 
-         
+         const filterVal = ['good_name', 'good_kind_name','good_type_name','medical_insurance_level_name','specification_name','manufacturer_name','packing_unit','packing_price','stock_warn_count','dealer_name','buy_price','medical_insurance_number','social_security_directory_code']
+
          const data = this.formatJson(filterVal,this.goodInfo.goodInfoData)
-     
+
          excel.export_json_to_excel({
            header: tHeader,
            data,
            filename: '耗材信息'
          })
           this.downloadLoading = false
-    
+
         })
        },
        formatJson(filterVal, jsonData) {

src/xt_pages/data/components/drugs.vue

@@ -96,13 +96,13 @@
           </div>
         </template>
       </el-table-column>
-  
+
       <el-table-column prop="date" label="进货价" width="100" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.last_price}}</div>
         </template>
       </el-table-column>
-     
+
       <el-table-column label="拆零零售价" width="100" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.min_price}}</div>
@@ -296,6 +296,7 @@
           drug_dose: '',//药品剂量
           drug_dose_unit: '',
           medical_insurance_number: '',//医保编号
+          provinces_code:'',//省编码
           manufacturer: '', //生产产商
           pharmacology_category: '',//药理分类
           statistics_category: '',//统计分类
@@ -349,6 +350,7 @@
           drug_dose: '',//药品剂量
           drug_dose_unit: '',
           medical_insurance_number: '',//医保编号
+          provinces_code:"",
           manufacturer: '', //生产产商
           pharmacology_category: '',//药理分类
           statistics_category: '',//统计分类
@@ -705,7 +707,7 @@
                  this.formValue.drug_classify = ""
               }
 
-              
+
 
               this.$refs.addDrugs.show(id, this.formValue)
 
@@ -970,7 +972,7 @@
            console.log("isHasMinUnit",isHasMinUnit)
           var isHasPackingUnit = header.includes('*包装单位')
           console.log("isHasPackingUnit",isHasPackingUnit)
-        
+
           var isHasDrugType =  header.includes('*药品类型');
           console.log("isHasDrugType",isHasDrugType)
           var isHasDrugStockLimit =  header.includes('*库存警戒');
@@ -979,14 +981,14 @@
           console.log("isHasDrugOriginPlace",isHasDrugOriginPlace)
           var isHasDrugDosageForm = header.includes('*药品剂型');
           console.log("isHasDrugDosageForm",isHasDrugDosageForm)
-         
+
           var isHasRetailPrice = header.includes('*拆零零售价');
           console.log("isHasRetailPrice",isHasRetailPrice)
           var isHasPackingPrice= header.includes('*包装零售价');
           console.log("isHasLastPrice",isHasPackingPrice)
           var isHasLastPrice = header.includes('*进货价');
           console.log("进货价",isHasLastPrice)
-          
+
           var isHasDrugClassifye = header.includes('*药物分类');
          console.log("isHasDrugClassifye",isHasDrugClassifye)
          var isHasManufacturer = header.includes('*生产厂商');
@@ -997,7 +999,7 @@
          console.log("isDrugDoseUnit",isDrugDoseUnit)
           if (!(isHasDrugName  && isHasDosage && isHasMaxUnit && isHasUnval && isHasMinUnit && isHasPackingUnit && isHasDrugType &&  isHasDrugStockLimit && isHasDrugOriginPlace &&
           isHasDrugDosageForm &&  isHasRetailPrice && isHasPackingPrice && isHasLastPrice && isHasDrugClassifye && isHasManufacturer && isHasDrugDose && isDrugDoseUnit)) {
-           
+
             this.dialogVisible = true;
             return
           }
@@ -1037,7 +1039,7 @@
            }
 
 
-  
+
           if (results[i]['*拆零'] === undefined) {
                 obj['min_number'] = ''
               } else {
@@ -1251,6 +1253,17 @@
               }
            }
 
+           if (results[i]['省编码'] === undefined) {
+             obj['provinces_code'] = ''
+           } else {
+             if (key == '省编码') {
+               obj['provinces_code'] = results[i][key].replace(/\s/g,"")
+             }
+           }
+
+
+
+
             if (results[i]['药理分类'] === undefined) {
                 obj['pharmacology_category'] = ''
               } else {
@@ -1415,7 +1428,7 @@
           'drugs':tableData
         };
         console.log("params222222222",params)
-        
+
         postDrugInformation(params).then(response=>{
            if(response.data.state == 1){
              var msg =  response.data.data.msg;
@@ -1485,15 +1498,15 @@
 
       exportList(){
          import('@/vendor/Export2Excel').then(excel => {
-         
-        
+
+
          console.log("this.table",this.list)
 
          for(let i=0;i<this.list.length;i++){
           for(let j=0;j<this.drugCategoryList.length;j++){
               if(this.list[i].drug_category == this.drugCategoryList[j].value){
                  this.list[i].drug_category_name = this.drugCategoryList[j].name
-              }  
+              }
           }
            for(let z=0;z<this.drugDosageFormList.length;z++){
               if(this.list[i].drug_dosage_form == this.drugDosageFormList[z].value){
@@ -1525,17 +1538,17 @@
          }
 
          const tHeader = ['药品名称','药品规格','剂量','剂量单位','拆零','拆零单位','包装单位','药品类型','库存警戒','产地','药品剂型','拆零零售价','包装零售价','进货价','药物分类','默认单次用量','默认单次用量单位','生产厂商','经销商','医保编码','社保目录编码']
-         const filterVal = ['drug_name', 'specification_name','dose','dose_unit','min_number','min_unit','max_unit','drug_category_name','drug_stock_limit','drug_origin_place','drug_dosage_form_name','min_price','retail_price','last_price','drug_classify_name','drug_dose','drug_dose_unit_name','manufacturer_name','dealer_name','medical_insurance_number','social_security_directory_code'] 
-         
+         const filterVal = ['drug_name', 'specification_name','dose','dose_unit','min_number','min_unit','max_unit','drug_category_name','drug_stock_limit','drug_origin_place','drug_dosage_form_name','min_price','retail_price','last_price','drug_classify_name','drug_dose','drug_dose_unit_name','manufacturer_name','dealer_name','medical_insurance_number','social_security_directory_code']
+
          const data = this.formatJson(filterVal,this.list)
-     
+
          excel.export_json_to_excel({
            header: tHeader,
            data,
            filename: '药品信息'
          })
           this.downloadLoading = false
-    
+
         })
        },
        formatJson(filterVal, jsonData) {

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

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

src/xt_pages/hospitalStation/chargeDetailManagement.vue

@@ -1149,7 +1149,8 @@ export default {
                 fulamt_ownpay_amt: prescription.advices[b].order_info.fulamt_ownpay_amt,
                 overlmt_amt: prescription.advices[b].order_info.overlmt_amt,
                 preselfpay_amt: prescription.advices[b].order_info.preselfpay_amt,
-                inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt
+                inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt,
+                execution_state: prescription.advices[b].execution_state,
 
               }
               tempAdvice.push(obj)
@@ -1175,7 +1176,9 @@ export default {
                 fulamt_ownpay_amt: prescription.project[b].order_info.fulamt_ownpay_amt,
                 overlmt_amt: prescription.project[b].order_info.overlmt_amt,
                 preselfpay_amt: prescription.project[b].order_info.preselfpay_amt,
-                inscp_scp_amt: prescription.project[b].order_info.inscp_scp_amt
+                inscp_scp_amt: prescription.project[b].order_info.inscp_scp_amt,
+                execution_state: prescription.project[b].execution_state,
+
 
               }
 

src/xt_pages/hospitalStation/components/ChargePrescriptionTable.vue

@@ -48,6 +48,13 @@
       </el-table-column>
 
 
+      <el-table-column align="center" prop="name" width="60" label="执行状态">
+        <template slot-scope="scope">
+          <div> {{scope.row.execution_state == 1?'已执行':'未执行'}}</div>
+        </template>
+      </el-table-column>
+
+
 
       <el-table-column align="center" prop="name" width="60" label="医保编码">
         <template slot-scope="scope">
@@ -170,6 +177,12 @@
         </template>
       </el-table-column>
 
+      <el-table-column align="center" prop="name" width="60" label="执行状态">
+        <template slot-scope="scope">
+          <div> {{scope.row.execution_state == 1?'已执行':'未执行'}}</div>
+        </template>
+      </el-table-column>
+
 
 
 

src/xt_pages/hospitalStation/index.vue

@@ -73,6 +73,17 @@
                         </el-select>
                     </el-form-item>
 
+                  <el-form-item label="参保地：">
+                    <el-select v-model="form.insuplc_admdvs" placeholder="请选择" style="width:100%;">
+                      <el-option
+                          v-for="item in InsuplcAdmdvs"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+
                     <!--<el-form-item class="specialFormItem" label="医保卡号：">-->
                     <!--<div style="display:flex;">-->
                     <!--<el-input v-model="form.medicalInsuranceCard"></el-input>-->
@@ -277,7 +288,8 @@
           phone: '',
           id_card_type: 2,
           med_type: '',
-          settlement_value: 1
+          settlement_value: 1,
+          insuplc_admdvs:''
 
         },
 
@@ -442,11 +454,19 @@
                 }).then(() => {
 
 
+
                 }).catch(() => {
                 })
               } else {
                 // console.log(parseNumber(response.data.data.info.output.insuinfo.psn_type))
                 // console.log(parseNumber(response.data.data.insutype))
+                for(let i =0; i < response.data.data.info.output.insuinfo.length; i++){
+                  that.InsuplcAdmdvs.push({
+                    value:response.data.data.info.output.insuinfo[i].insuplc_admdvs,
+                    label:response.data.data.info.output.insuinfo[i].insuplc_admdvs,
+                  })
+
+                }
 
                 that.form.psn_type = parseInt(response.data.data.info.output.insuinfo[0].psn_type)
                 that.form.social_type = parseInt(response.data.data.insutype)
@@ -693,7 +713,8 @@
               start_time: this.form.start_time,
               social_type: this.form.social_type,
               psn_type: this.form.psn_type,
-              balance_accounts_type: this.form.settlement_value
+              balance_accounts_type: this.form.settlement_value,
+              insuplc_admdvs: this.form.insuplc_admdvs
 
             }
             params['record_time'] = this.record_date

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -47,6 +47,12 @@
         </template>
       </el-table-column>
 
+      <el-table-column align="center" prop="name" width="60" label="执行状态">
+        <template slot-scope="scope">
+          <div> {{scope.row.execution_state == 1 ? '已执行':'未执行'}}</div>
+        </template>
+      </el-table-column>
+
 
       <el-table-column align="center" prop="name" width="120" label="医保编码">
         <template slot-scope="scope">
@@ -150,6 +156,11 @@
         <template slot-scope="scope">{{scope.row.price}}元</template>
       </el-table-column>
 
+      <el-table-column align="center" prop="name" width="60" label="执行状态">
+        <template slot-scope="scope">
+          <div> {{scope.row.execution_state == 1 ? '已执行':'未执行'}}</div>
+        </template>
+      </el-table-column>
 
 
       <el-table-column align="center" prop="name" width="120" label="医保编码">

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -110,6 +110,18 @@
       <!--</el-select>-->
       <!--</el-form-item>-->
 
+      <el-form-item label="参保地：">
+        <el-select v-model="form.insuplc_admdvs" placeholder="请选择" style="width:100%;">
+          <el-option
+              v-for="item in InsuplcAdmdvs"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+
 
       <el-form-item label="结算类型：">
         <el-select v-model="form.settlement_value" placeholder="请选择" style="width:100%;">
@@ -247,6 +259,7 @@
 
         form: {
           id: '',
+          insuplc_admdvs:'',
           settlement_value: 1,
           medical_insurance_card: '',
           name: '',
@@ -288,6 +301,7 @@
           { value: 7, label: '合同' },
           {value: 8, label: '医保自费'},
 
+        ],InsuplcAdmdvs:[
         ],
         sex: [{
           value: 1,
@@ -544,6 +558,55 @@
           '-' +
           birth.substr(6, 2)
         this.form.age = jsGetAge(births, '-')
+
+
+
+        var that = this
+        let params={
+          id_card_no: this.form.id_card,
+          admin_user_id:this.$store.getters.xt_user.user.id,
+
+        }
+        axios.get('http://127.0.0.1:9532/zh/api/patient/info', {
+          params: params,
+          headers: {
+            'Permission': 5
+          }
+        })
+            .then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg)
+                that.loadingone = false
+                return false
+              } else {
+                that.loadingone = false
+                if (response.data.data.failed_code == -10) {
+                  // that.$message.error(response.data.data.msg)
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                } else {
+                  for(let i =0; i < response.data.data.info.output.insuinfo.length; i++){
+                    that.InsuplcAdmdvs.push({
+                      value:response.data.data.info.output.insuinfo[i].insuplc_admdvs,
+                      label:response.data.data.info.output.insuinfo[i].insuplc_admdvs,
+                    })
+
+                  }
+
+
+                  that.form.social_type = parseInt(response.data.data.insutype)
+                }
+              }
+            })
+            .catch(function(error) {
+
+            })
+
       },
       querySearchAsync(keyword, cb) {
         let key = ''
@@ -630,6 +693,7 @@
         this.form.cost = ''
         this.form.phone = ''
         this.form.social_type = ''
+        this.form.insuplc_admdvs =''
 
         this.form.p_type = 14
         this.form.sick_type = this.sick[0].id

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1232,6 +1232,7 @@ export default {
                 prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                 medical_insurance_number: prescription.advices[b].med_list_codg,
 
+
                 code: prescription.advices[b].drug.medical_insurance_number,
                 spec: spec,
                 det_item_fee_sumamt: prescription.advices[b].order_info.det_item_fee_sumamt,
@@ -1239,7 +1240,8 @@ export default {
                 fulamt_ownpay_amt: prescription.advices[b].order_info.fulamt_ownpay_amt,
                 overlmt_amt: prescription.advices[b].order_info.overlmt_amt,
                 preselfpay_amt: prescription.advices[b].order_info.preselfpay_amt,
-                inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt
+                inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt,
+                execution_state: prescription.advices[b].execution_state,
 
               }
               tempAdvice.push(obj)
@@ -1267,7 +1269,10 @@ export default {
                 fulamt_ownpay_amt: prescription.project[b].order_info.fulamt_ownpay_amt,
                 overlmt_amt: prescription.project[b].order_info.overlmt_amt,
                 preselfpay_amt: prescription.project[b].order_info.preselfpay_amt,
-                inscp_scp_amt: prescription.project[b].order_info.inscp_scp_amt
+                inscp_scp_amt: prescription.project[b].order_info.inscp_scp_amt,
+
+                execution_state: prescription.project[b].execution_state,
+
 
               }
 
@@ -3611,7 +3616,8 @@ export default {
                       fulamt_ownpay_amt: prescription.advices[b].order_info.fulamt_ownpay_amt,
                       overlmt_amt: prescription.advices[b].order_info.overlmt_amt,
                       preselfpay_amt: prescription.advices[b].order_info.preselfpay_amt,
-                      inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt
+                      inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt,
+                      execution_state:prescription.advices[b].execution_state,
 
                     }
                     tempAdvice.push(obj)
@@ -3634,6 +3640,7 @@ export default {
                       // medical_code: prescription.project[b].project.medical_code,
                       unit: prescription.project[b].unit,
                       type: prescription.project[b].type,
+                      execution_state:prescription.project[b].execution_state,
 
                       det_item_fee_sumamt: prescription.project[b].order_info.det_item_fee_sumamt,
                       fulamt_ownpay_amt: prescription.project[b].order_info.fulamt_ownpay_amt,

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2296,7 +2296,7 @@
                   this.prescriptions[i].addition[b].count = this.prescriptions[i].addition[b].count.toString()
                 }
               }
-            
+
               let data = {
                 'prescriptions': this.prescriptions
               }
@@ -2864,7 +2864,8 @@
                   medical_insurance_number: temp[b].medical_insurance_number,
                   drug: temp[b],
                   groupno: index + temp_index,
-                  hosp_appr_flag: '1'
+                  hosp_appr_flag: '1',
+                  execution_state:2,
                 }
 
                 if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
@@ -2893,7 +2894,9 @@
                   remark: '',
                   medical_code: temp2[b].medical_code,
                   unit: temp2[b].unit,
-                  type: temp2[b].type
+                  type: temp2[b].type,
+                  execution_state:2,
+
                 }
 
                 if (temp2[b].type == 2){

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -983,6 +983,9 @@ export default {
             // price = price + project_month_prescriptions.project[a].price
             obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
 
+
+
+
           }
         }
         obj['total'] = count
@@ -1445,7 +1448,8 @@ export default {
                   id: prescription.advices[b].drug_id,
                   drug: prescription.advices[b].drug,
                   groupno: prescription.advices[b].groupno,
-                  hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString()
+                  hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+                  execution_state: prescription.advices[b].execution_state,
 
                 }
                 tempAdvice.push(obj)
@@ -1467,7 +1471,9 @@ export default {
                   remark: prescription.project[b].remark,
                   medical_code: prescription.project[b].project.medical_code,
                   unit: prescription.project[b].project.unit,
-                  type: prescription.project[b].type
+                  type: prescription.project[b].type,
+                  execution_state: prescription.project[b].execution_state,
+
 
                 }
 
@@ -1575,7 +1581,9 @@ export default {
                     id: prescription.advices[b].drug_id,
                     drug: prescription.advices[b].drug,
                     groupno: prescription.advices[b].groupno,
-                    hosp_appr_flag: '1'
+                    hosp_appr_flag: '1',
+                    execution_state: 2,
+
 
                   }
 
@@ -1620,7 +1628,8 @@ export default {
                     remark: prescription.project[b].remark,
                     medical_code: prescription.project[b].project.medical_code,
                     unit: prescription.project[b].project.unit,
-                    type: prescription.project[b].type
+                    type: prescription.project[b].type,
+                    execution_state: 2,
 
                   }
 
@@ -1845,7 +1854,9 @@ export default {
                         id: prescription.advices[b].drug_id,
                         drug: prescription.advices[b].drug,
                         groupno: prescription.advices[b].groupno,
-                        hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString()
+                        hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+                        execution_state: prescription.advices[b].execution_state,
+
 
                       }
                       tempAdvice.push(obj)
@@ -1867,7 +1878,8 @@ export default {
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
                         unit: prescription.project[b].project.unit,
-                        type: prescription.project[b].type
+                        type: prescription.project[b].type,
+                        execution_state: prescription.project[b].execution_state,
                       }
 
                       if (prescription.project[b].type == 2) {
@@ -1977,7 +1989,9 @@ export default {
                           drug: prescription.advices[b].drug,
                           groupno: prescription.advices[b].groupno,
 
-                          hosp_appr_flag: '1'
+                          hosp_appr_flag: '1',
+                          execution_state: 2,
+
 
                         }
                         console.log('看看数据1：')
@@ -2021,7 +2035,8 @@ export default {
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
                           unit: prescription.project[b].project.unit,
-                          type: prescription.project[b].type
+                          type: prescription.project[b].type,
+                          execution_state: 2,
 
                         }
 
@@ -2344,7 +2359,8 @@ export default {
                         id: prescription.advices[b].drug_id,
                         drug: prescription.advices[b].drug,
                         groupno: prescription.advices[b].groupno,
-                        hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString()
+                        hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+                        execution_state: prescription.advices[b].execution_state,
 
                       }
                       tempAdvice.push(obj)
@@ -2365,7 +2381,9 @@ export default {
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
                         unit: prescription.project[b].project.unit,
-                        type: prescription.project[b].type
+                        type: prescription.project[b].type,
+                        execution_state: prescription.project[b].execution_state,
+
                       }
 
                       if (prescription.project[b].type == 2) {
@@ -2469,7 +2487,9 @@ export default {
                           drug: prescription.advices[b].drug,
                           groupno: prescription.advices[b].groupno,
 
-                          hosp_appr_flag: '1'
+                          hosp_appr_flag: '1',
+                          execution_state: 2,
+
 
                         }
                         console.log('看看数据2：')
@@ -2511,7 +2531,9 @@ export default {
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
                           unit: prescription.project[b].project.unit,
-                          type: prescription.project[b].type
+                          type: prescription.project[b].type,
+                          execution_state: 2,
+
                         }
 
                         if (prescription.project[b].type == 2) {
@@ -2823,7 +2845,9 @@ export default {
                       id: prescription.advices[b].drug_id,
                       drug: prescription.advices[b].drug,
                       groupno: prescription.advices[b].groupno,
-                      hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString()
+                      hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+                      execution_state: prescription.advices[b].execution_state
+
 
                     }
                     tempAdvice.push(obj)
@@ -2844,7 +2868,9 @@ export default {
                       remark: prescription.project[b].remark,
                       medical_code: prescription.project[b].project.medical_code,
                       unit: prescription.project[b].project.unit,
-                      type: prescription.project[b].type
+                      type: prescription.project[b].type,
+                      execution_state: prescription.project[b].execution_state
+
                     }
 
                     if (prescription.project[b].type == 2) {
@@ -2948,7 +2974,9 @@ export default {
                         drug: prescription.advices[b].drug,
                         groupno: prescription.advices[b].groupno,
 
-                        hosp_appr_flag: '1'
+                        hosp_appr_flag: '1',
+                        execution_state: 2
+
 
                       }
                       console.log('看看数据3：')
@@ -2990,7 +3018,9 @@ export default {
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
                         unit: prescription.project[b].project.unit,
-                        type: prescription.project[b].type
+                        type: prescription.project[b].type,
+                        execution_state: 2
+
                       }
 
                       if (prescription.project[b].type == 2) {
@@ -3362,7 +3392,9 @@ export default {
                         id: prescription.advices[b].drug_id,
                         drug: prescription.advices[b].drug,
                         groupno: prescription.advices[b].groupno,
-                        hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString()
+                        hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+                        execution_state: prescription.advices[b].execution_state
+
 
                       }
                       tempAdvice.push(obj)
@@ -3383,7 +3415,9 @@ export default {
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
                         unit: prescription.project[b].project.unit,
-                        type: prescription.project[b].type
+                        type: prescription.project[b].type,
+                        execution_state: prescription.project[b].execution_state
+
                       }
 
                       if (prescription.project[b].type == 2) {
@@ -3494,7 +3528,9 @@ export default {
                           drug: prescription.advices[b].drug,
                           groupno: prescription.advices[b].groupno,
 
-                          hosp_appr_flag: '1'
+                          hosp_appr_flag: '1',
+                          execution_state: 2,
+
 
                         }
                         console.log('看看数据4：')
@@ -3536,7 +3572,8 @@ export default {
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
                           unit: prescription.project[b].project.unit,
-                          type: prescription.project[b].type
+                          type: prescription.project[b].type,
+                          execution_state: 2,
                         }
 
                         if (prescription.project[b].type == 2) {
@@ -3931,7 +3968,9 @@ export default {
                         id: prescription.advices[b].drug_id,
                         drug: prescription.advices[b].drug,
                         groupno: prescription.advices[b].groupno,
-                        hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString()
+                        hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
+                        execution_state: prescription.advices[b].execution_state
+
 
                       }
                       tempAdvice.push(obj)
@@ -3953,7 +3992,9 @@ export default {
                         remark: prescription.project[b].remark,
                         medical_code: prescription.project[b].project.medical_code,
                         unit: prescription.project[b].project.unit,
-                        type: prescription.project[b].type
+                        type: prescription.project[b].type,
+                        execution_state: prescription.project[b].execution_state
+
                       }
 
                       if (prescription.project[b].type == 2) {
@@ -4064,7 +4105,9 @@ export default {
                           drug: prescription.advices[b].drug,
                           groupno: prescription.advices[b].groupno,
 
-                          hosp_appr_flag: '1'
+                          hosp_appr_flag: '1',
+                          execution_state: 2
+
 
                         }
                         console.log('看看数据5：')
@@ -4107,7 +4150,9 @@ export default {
                           remark: prescription.project[b].remark,
                           medical_code: prescription.project[b].project.medical_code,
                           unit: prescription.project[b].project.unit,
-                          type: prescription.project[b].type
+                          type: prescription.project[b].type,
+                          execution_state: 2
+
                         }
 
                         if (prescription.project[b].type == 2) {

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -108,7 +108,11 @@
             </el-form-item>
             <el-form-item label="医保编码 : " prop="medical_insurance_number">
               <el-input v-model="form.medical_insurance_number" style="width:160px;" placeholder=""
-                        maxlength="30"></el-input>
+                        ></el-input>
+            </el-form-item>
+            <el-form-item label="省编码 : " prop="provinces_code">
+              <el-input v-model="form.provinces_code" style="width:160px;" placeholder=""
+                        ></el-input>
             </el-form-item>
             <el-form-item label="是否特病目录:" prop="is_special_diseases">
               <el-select v-model="form.is_special_diseases" style="width:160px;" placeholder="请选择">
@@ -342,6 +346,7 @@
           good_unit: '',
           retail_price: '',
           medical_insurance_number: '',
+          provinces_code:'',
           is_special_diseases: '',
           is_record: '',
           statistics_category: '',
@@ -475,6 +480,7 @@
               good_unit: '',
               retail_price: '',
               medical_insurance_number: '',
+            provinces_code:'',
               is_special_diseases: '',
               is_record: '',
               statistics_category: '',
@@ -559,6 +565,8 @@
         form['manufacturer'] = this.form.manufacturer
         form['retail_price'] = this.form.retail_price
         form['medical_insurance_number'] = this.form.medical_insurance_number
+        form['provinces_code'] = this.form.provinces_code
+
         form['is_special_diseases'] = this.form.is_special_diseases
         form['is_record'] = this.form.is_record
         form['statistics_category'] = this.form.statistics_category

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

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

src/xt_pages/stock/drugs/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/drugStockFlow.vue

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

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

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

src/xt_pages/stock/drugs/drugStockOutOrder.vue

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

src/xt_pages/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

@@ -208,11 +208,11 @@
             {{ scope.row.warehousing_count}}{{scope.row.GoodInfo.packing_unit}}
           </template>
         </el-table-column>
-         <el-table-column label="零售价" align="center">
+         <!-- <el-table-column label="零售价" align="center">
           <template slot-scope="scope">
             {{ scope.row.packing_price}}
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="进货价" align="center">
           <template slot-scope="scope">
             {{ scope.row.price}}

src/xt_pages/stock/stockInOrderAdd.vue

@@ -660,6 +660,7 @@
       }
       ,
       submit() {
+        console.log("res23322332",this.$refs)
         this.$refs['tableForm'].validate((valid) => {
           if (valid) {
             const array = this.recordInfo.recordData

src/xt_pages/supply/components/addGoodOrder.vue

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

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -3,7 +3,7 @@
 <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>
@@ -44,11 +44,13 @@
             value-format="yyyy-MM-dd"
             @change="endTimeChange"
         ></el-date-picker>
-        <span>单据编码:</span>
+        <span>单据编码:{{number}}</span>
 
     </div>
     <div>
         <el-button size="small" type="primary" @click="savePurchaseOrder" v-show="showTwo">保存</el-button>
+        <el-button size="small" type="primary" @click="toPrint()" v-show="showOne">打印</el-button>
+        <el-button size="small" type="primary" @click="checkPurchaseOrder" v-show="showOne">审核</el-button>
         <el-button size="small" type="primary" @click="updatePurchaseOrder" v-show="showOne">修改</el-button>
     </div>
     </div>
@@ -71,8 +73,8 @@
             <span>商品<span style="color: red">*</span></span>
         </template>
         <template slot-scope="scope">
-           <el-form-item required prop="name">
-            <el-select v-model="scope.row.name" style="width:160px;" filterable placeholder="请选择" @change="changeName"   @input="changeGoodName(scope.$index)">
+           <el-form-item :prop="'tableList.' + scope.$index + '.name'" :rules='tableRules.name'>
+            <el-select v-model="scope.row.name" style="width:160px;" filterable placeholder="请选择" @change="changeName"   @input="changeGoodName(scope.$index)" :disabled="disabled">
                 <el-option
                     v-for="(item,index) in tabList"
                     :key="index"
@@ -95,7 +97,24 @@
         <template slot-scope="scope">
             <el-input v-model="scope.row.supply_specification_name" style="width:150px" :disabled="true"></el-input>
         </template>
-        </el-table-column>
+    </el-table-column>
+     <el-table-column label="单位" align="center" width="120px">
+        <template slot="header" slot-scope="scope">
+            <span>单位<span style="color: red">*</span></span>
+        </template>
+        <template slot-scope="scope">
+          <el-form-item :prop="'tableList.' + scope.$index + '.supply_unit'" :rules='tableRules.supply_unit'>
+            <el-select v-model="scope.row.supply_unit" style="width:100px;" filterable placeholder="请选择"  :disabled="disabled">
+                    <el-option
+                        v-for="(item,index) in scope.row.unitList"
+                        :key="index"
+                        :label="item.name"
+                        :value="item.name">
+                    </el-option>
+             </el-select>
+          </el-form-item>  
+        </template>
+    </el-table-column>
     <el-table-column label="可用库存" align="center" width="130px">
         <template slot-scope="scope">
             <el-input v-model="scope.row.supply_total" style="width:100px" :disabled="true"></el-input>
@@ -106,15 +125,17 @@
             <span>数量<span style="color: red">*</span></span>
         </template>
         <template slot-scope="scope">
-          <el-form-item :rules="tableRules.supply_count" required prop="supply_count">
-          <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" :disabled="disabled"></el-input>
           </el-form-item>
         </template>
     </el-table-column>
 
+   
+
     <el-table-column label="购货单价" align="center" width="120px">
         <template slot-scope="scope">
-        <el-input v-model="scope.row.supply_price" style="width:80px"></el-input>
+        <el-input v-model="scope.row.supply_price" style="width:80px" :disabled="disabled"></el-input>
         </template>
     </el-table-column>
 
@@ -133,13 +154,13 @@
 
     <el-table-column label="批准文号" align="center" width="200px">
         <template slot-scope="scope">
-        <el-input v-model="scope.row.supply_license_number" style="width:160px"></el-input>
+        <el-input v-model="scope.row.supply_license_number" style="width:160px" :disabled="disabled"></el-input>
         </template>
     </el-table-column>
 
     <el-table-column label="备注" align="center" width="200px">
         <template slot-scope="scope">
-        <el-input v-model="scope.row.supply_remake" style="width:160px"></el-input>
+        <el-input v-model="scope.row.supply_remake" style="width:160px" :disabled="disabled"></el-input>
         </template>
     </el-table-column>
 
@@ -166,6 +187,9 @@
     </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>
 
@@ -178,8 +202,9 @@
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-
-import {getInitOrder,savePurchaseOrder} from "@/api/supply"
+import {uParseTime } from '@/utils/tools'
+import {getInitOrder,savePurchaseOrder,updatePurchaseOrder,checkPurchaseOrder} from "@/api/supply"
+import {getDataConfig } from '@/utils/data'
 export default {
 name: "addPurchaseOrder",
 created() {
@@ -241,8 +266,23 @@ return {
     tableRules: {
      name: [{ required: true, message: '商品不能为空', trigger: 'blur' }],
      supply_count: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
- },
-};
+     supply_unit:[{required:true,message: '单位不能为空', trigger: 'blur'}]
+   },
+   warehousing_id:0,
+   number:"",
+   loading:false,
+   drugList:[],
+   goodList:[],
+   id:0,
+   disabled:false,
+   unitList:[
+     {id:1,name:""},
+     {id:2,name:""}
+   ],
+   goodList:[
+     {id:1,name:""},
+   ],
+  };
 },
 methods:{
 
@@ -250,11 +290,13 @@ getInitOrder(){
     getInitOrder().then(response=>{
     if(response.data.state == 1){
         var drugList = response.data.data.drugList
+        
         this.manufactuerList = response.data.data.manufactuerList
         this.goodTypeList = response.data.data.goodTypeList
         this.drugTypeList = response.data.data.drugTypeList
         this.supplyList = response.data.data.supplyList
        for(let i=0;i<drugList.length;i++){
+          
           for(let z=0;z<drugList[i].drug_warehouse_info.length;z++){
             drugList[i].drug_warehouse_info[z].stock_max_number = drugList[i].drug_warehouse_info[z].stock_max_number * drugList[i].min_number
           }
@@ -278,14 +320,21 @@ getInitOrder(){
         drugList[i].supply_license_number= drugList[i].number
         drugList[i].supply_remake = ""
         drugList[i].type = 1
-        drugList[i].supply_price = ""
+        drugList[i].supply_price = drugList[i].last_price
         drugList[i].name = drugList[i].drug_name
-
+        drugList[i].supply_unit = drugList[i].max_unit
+        drugList[i].unitList = [{id:1,name:""},{id:2,name:""}]
+        for(let j=0;j<drugList[i].unitList.length;j++){
+           drugList[i].unitList[0].name = drugList[i].max_unit
+           drugList[i].unitList[1].name = drugList[i].min_unit
+        }
         this.tabList.push(drugList[i])
         }
-
+        this.drugList = drugList
         var goodList =  response.data.data.goodList
+       
         for(let i=0;i<goodList.length;i++){
+       
         for(let j=0;j<this.manufactuerList.length;j++){
             if(goodList[i].manufacturer == this.manufactuerList[j].id){
                 goodList[i].manufacturer = this.manufactuerList[j].manufacturer_name
@@ -299,7 +348,7 @@ getInitOrder(){
         goodList[i].supply_name = goodList[i].good_name + " " + goodList[i].specification_name + " " +goodList[i].manufacturer
         goodList[i].supply_type = goodList[i].good_type_id
         goodList[i].supply_specification_name =goodList[i].specification_name
-        goodList[i].supply_price = ""
+        goodList[i].supply_price = goodList[i].buy_price
         goodList[i].supply_total = this.getTotalStockCount(goodList[i].good_warehouse_info)
         goodList[i].supply_count = ""
         goodList[i].supply_total_price = ""
@@ -308,26 +357,32 @@ getInitOrder(){
         goodList[i].supply_remake = ""
         goodList[i].type = 2
         goodList[i].name = goodList[i].good_name
-
+        goodList[i].supply_unit = goodList[i].packing_unit
+        goodList[i].unitList =  [{id:1,name:""},{id:2,name:""}]
+        for(let j=0;j<goodList[i].unitList.length;j++){
+           goodList[i].unitList[0].name = goodList[i].packing_unit 
+        }
         this.tabList.push(goodList[i])
         }
-    }
+        this.goodList = goodList
+    } 
     })
 },
 changeGoodName(val){
   this.currentIndex = val
 },
 changeName(val){
-
+   console.log("val3233232322332",val)
    for(let i=0;i<this.recordInfo.tableList.length;i++){
     if(this.currentIndex == i){
-        this.recordInfo.tableList[i].id = val.id
+        this.recordInfo.tableList[i].project_id = val.id
         this.recordInfo.tableList[i].type = val.type
         this.recordInfo.tableList[i].name = val.name
         this.recordInfo.tableList[i].supply_name = val.supply_name
         this.recordInfo.tableList[i].supply_type = val.supply_type
         this.recordInfo.tableList[i].supply_specification_name = val.supply_specification_name
         this.recordInfo.tableList[i].supply_total = val.supply_total
+        
         if(val.supply_count == NaN){
            this.recordInfo.tableList[i].supply_count = ""
         }else{
@@ -339,13 +394,17 @@ changeName(val){
         this.recordInfo.tableList[i].supply_manufacturer = val.supply_manufacturer
         this.recordInfo.tableList[i].supply_license_number = val.supply_license_number
         this.recordInfo.tableList[i].supply_remake = val.supply_remake
+        this.recordInfo.tableList[i].is_total = val.is_total
+        this.recordInfo.tableList[i].supply_unit = val.supply_unit
+        this.recordInfo.tableList[i].unitList = val.unitList
      }
     }
+   
 
 },
 handleEdit(){
     const tempObj = {}
-    tempObj["id"] = ""
+    tempObj["id"] = 0
     tempObj["name"] = ""
     tempObj['supply_name'] = ""
     tempObj['supply_type'] = ""
@@ -358,6 +417,9 @@ handleEdit(){
     tempObj['supply_license_number'] = ''
     tempObj['supply_remake'] = ''
     tempObj['type'] = 0
+    tempObj['is_total'] = 1
+    tempObj["project_id"] = 0
+    tempObj["supply_unit"] = ""
     this.recordInfo.tableList.push(tempObj)
 },
 handleDelete: function(index, row) {
@@ -371,21 +433,20 @@ handleDelete: function(index, row) {
 
 
 savePurchaseOrder(){
-   // console.log("tablelsit323232",this.recordInfo.tableList)
-   console.log("hhh232323",this.$refs)
+    this.loading = true
+    if(this.supplier_name == 0 || this.supplier_name == ""){
+       this.$message.error("供应商不能为空!")
+       this.loading = false
+       return false
+    }
     this.$refs["tableForm"].validate((valid)=>{
       if(valid){
-        var params = {
-        supplier_name:this.supplier_name,
-        start_time:this.start_time,
-        end_time:this.end_time,
-        rate_of_concession:this.rate_of_concession,
-        discount_amount:this.discount_amount,
-        }
-        console.log("partam2332232332",params)
-        console.log("tablelsit323232",this.recordInfo.tableList)
         for(let i=0;i<this.recordInfo.tableList.length;i++){
             this.recordInfo.tableList[i].supply_count = parseInt(this.recordInfo.tableList[i].supply_count)
+            this.recordInfo.tableList[i].supply_license_number = this.recordInfo.tableList[i].supply_license_number.toString()
+            this.recordInfo.tableList[i].supply_total_price = (this.recordInfo.tableList[i].supply_count * this.recordInfo.tableList[i].supply_price).toString()
+            this.recordInfo.tableList[i].supply_total = this.recordInfo.tableList[i].supply_total.toString()
+            this.recordInfo.tableList[i].supply_price = this.recordInfo.tableList[i].supply_price.toString()
             for(let j=0;j<this.manufactuerList.length;j++){
                 if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].manufacturer_name){
                 this.recordInfo.tableList[i].manufacturer_id = this.manufactuerList[j].id
@@ -393,11 +454,68 @@ savePurchaseOrder(){
 
             }
         }
-        return
-        savePurchaseOrder(this.recordInfo.tableList,this.supplier_name,this.start_time,this.end_time,this.rate_of_concession,this.discount_amount).then(response=>{
+        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++){
+                   if(orderInfo[i].is_source == 1){
+                    for(let j=0;j<this.drugList.length;j++){
+                       if(orderInfo[i].project_id == this.drugList[j].id){
+                          orderInfo[i].unitList = [{id:1,name:""},{id:2,name:""}]
+                          orderInfo[i].unitList[0].name = this.drugList[j].max_unit
+                          orderInfo[i].unitList[1].name = this.drugList[j].min_unit
+                       }
+                    }  
+                   } 
+                  if(orderInfo[i].is_source == 2){
+                    for(let j=0;j<this.goodList.length;j++){
+                       if(orderInfo[i].project_id == this.goodList[j].id){
+                          orderInfo[i].unitList = [{id:1,name:""}]
+                          orderInfo[i].unitList[0].name = this.goodList[j].packing_unit
+                       }
+                    }  
+                   } 
+                  orderInfo[i].supply_count = orderInfo[i].count
+                  orderInfo[i].supply_price = orderInfo[i].price
+                  orderInfo[i].supply_remake = orderInfo[i].remark
+                  orderInfo[i].type = orderInfo[i].is_source
+                  orderInfo[i].project_id = orderInfo[i].project_id
+                  orderInfo[i].supply_unit = orderInfo[i].supply_unit
+                }
+                console.log("orderINFO23323232",orderInfo)
+                this.recordInfo.tableList = orderInfo
+                // 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
             }
@@ -408,6 +526,7 @@ savePurchaseOrder(){
 
 },
 
+
 changeTypeName(){
 
 },
@@ -463,13 +582,86 @@ calculate: function(val) {
     }
     return Math.round(parseFloat(val) * 100) / 100;
   },
+getTimes(time) {
+    if (time === '') {
+    return ''
+    }
+    return uParseTime(time, '{y}-{m}-{d}')
+},
  updatePurchaseOrder(){
-
- }
+   this.loading = true 
+    if(this.supplier_name == 0 || this.supplier_name == ""){
+        this.$message.error("供应商不能为空!")
+        this.loading = false
+        return false
+    }
+   this.$refs["tableForm"].validate((valid)=>{
+      if(valid){
+        for(let i=0;i<this.recordInfo.tableList.length;i++){
+           this.recordInfo.tableList[i].supply_count = parseInt(this.recordInfo.tableList[i].supply_count)
+           this.recordInfo.tableList[i].supply_license_number = this.recordInfo.tableList[i].supply_license_number.toString()
+           this.recordInfo.tableList[i].supply_total_price = (this.recordInfo.tableList[i].supply_count * this.recordInfo.tableList[i].supply_price).toString()
+           this.recordInfo.tableList[i].supply_total = this.recordInfo.tableList[i].supply_total.toString()
+            this.recordInfo.tableList[i].supply_price = this.recordInfo.tableList[i].supply_price.toString()
+           for(let j=0;j<this.manufactuerList.length;j++){
+              if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].manufacturer_name){
+                this.recordInfo.tableList[i].manufacturer_id = this.manufactuerList[j].id
+              }
+           }
+        }
+        var start = this.getTimes(this.start_time)
+        var end = this.getTimes(this.end_time)
+        const params = {
+        'stockIn': this.recordInfo.tableList
+        }
+        console.log("params23232233223",params)
+        
+        updatePurchaseOrder(params,this.supplier_name,start,end,this.rate_of_concession,this.discount_amount,this.id,this.number).then(response=>{
+           if(response.data.state == 1){
+            this.loading = false
+             var warehousingInfo =  response.data.data.warehousingInfo
+             this.$message.success("修改成功!")
+           }
+        })
+      } 
+   })
+ },
+ getAllPrice(){
+   var total_price = 0
+   for(let i=0;i<this.recordInfo.tableList.length;i++){
+      total_price += (this.recordInfo.tableList[i].supply_price * this.recordInfo.tableList[i].supply_count)
+   }  
+   return total_price.toFixed(2)
+ },
+ checkPurchaseOrder(id,index){
+   this.$confirm('是否审核?', {
+    confirmButtonText: '确 定',
+    cancelButtonText: '取 消',
+    type: 'warning'
+    }).then(() => {
+    console.log("id232233232323223",this.id)    
+    checkPurchaseOrder(this.id).then(response => {
+        if (response.data.state == 1) {
+          var info = response.data.data.info
+          this.disabled = true
+          this.$message.success("审核成功!")
+        } 
+     })
+    })
+    .catch(() => {
+    }) 
+  },
+  toPrint(){
+     var id = this.id
+     this.$router.push({path:"/purchase/order/print?&id="+id})  
+  },
+  getDataConfig(module, filed_name){
+    return getDataConfig(module, filed_name)
+  },
 },
 created(){
     const tempObj = {}
-    tempObj["id"] = ""
+    tempObj["id"] = 0
     tempObj["name"] = ""
     tempObj['supply_name'] = ""
     tempObj['supply_type'] = ""
@@ -482,6 +674,9 @@ created(){
     tempObj['supply_license_number'] = ''
     tempObj['supply_remake'] = ''
     tempObj['type'] = 0
+    tempObj['is_total'] = 1
+    tempObj["project_id"] = 0
+    tempObj["supply_unit"] = ""
     this.recordInfo.tableList.push(tempObj)
     this.getInitOrder()
 }
@@ -541,6 +736,6 @@ background-color: #d0d3da;
 .el-table__fixed-right{
   width:150px;
   bottom: 20px;
-  height: 200px;
+  height: 100%;
 }
 </style>

src/xt_pages/supply/components/editPurchaseOrder.vue

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

src/xt_pages/supply/components/purchaseOrderPrint.vue

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

src/xt_pages/supply/goodOrderQuery.vue

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

src/xt_pages/supply/purchaseOrderQuery.vue

@@ -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,55 +97,57 @@
         </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>
 
        <el-table-column label="操作" align="center" width="260px">
           <template slot-scope="scope">
               <el-button
+                icon="el-icon-edit-outline"
                 size="small"
                 type="primary"
-                @click="toClick(scope.row)"
-              >库存流水
+                @click="toClick(scope.row.id)"
+              >编辑
               </el-button>
               <el-button
+                icon="el-icon-delete"
                 size="small"
-                type="primary"
+                type="danger"
                 @click="toClickOne(scope.row)"
-              >批次
+              >删除
               </el-button>
           </template>
         </el-table-column>
@@ -168,27 +172,13 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 
-
+import {getAllSupply,getAllPurchaseOrderList} from "@/api/supply"
+import {uParseTime } from '@/utils/tools'
 export default {
   name: "stockIn",
    components: {
      
    },
-  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
   },
@@ -196,14 +186,14 @@ export default {
     return {
       crumbs: [
         { path: false, name: "采购管理" },
-        { path: "/spply/query", name: "供应商管理" }
+        { path: "/spply/query", name: "购货订单" }
       ],
       keywords: "",
       total: 0,
       multipleSelection: [],
       signAndWeighBoxPatients: "sign-and-weigh-box-patients",
       start_time: "",
-      end_time: "",
+      end_time:new Date(),
       page: 1,
       limit: 10,
       goodType: [],
@@ -212,6 +202,14 @@ export default {
       types:[],
       tableList:[],
       type_name:"",
+      checkList:[
+        {id:0,name:"请选择"},
+        {id:1,name:"已审核"},
+        {id:2,name:"未审核"},
+      ],
+      supplyList:[],
+      check_id:0,
+      doctorList:[],
     };
   },
   methods:{
@@ -230,13 +228,105 @@ export default {
      search(){
 
      },
-     handleSizeChange(){
-
+     handleSizeChange(val){
+       this.limit = val
+       this.getlist()
      },
-     handleCurrentChange(){
+     handleCurrentChange(val){
+       this.page = val
+       this.getlist()
+     },
+     getAllSupply(){
+       getAllSupply().then(response=>{
+         if(response.data.state == 1){
+            var supplyList = response.data.data.supplyList
+            this.doctorList = response.data.data.doctorList
+            for(let i=0;i<supplyList.length;i++){
+              this.supplyList.push(supplyList[i])
+            }
+         }
+       })
+     },
+     changeTypeName(){
 
-     } 
-  }
+     },
+     getTimes(time) {
+      if (time === '') {
+      return ''
+      }
+      return uParseTime(time, '{y}-{m}-{d}')
+     },
+     getlist(){
+        var params = {
+          check_id:this.check_id,
+          start_time:this.getTimes(this.start_time),
+          end_time:this.getTimes(this.end_time),
+          keyword:this.keywords,
+          page:this.page,
+          limit:this.limit,
+        }
+       getAllPurchaseOrderList(params).then(response=>{
+          if(response.data.state == 1){
+            var list = response.data.data.list 
+            console.log("list2332232323232",list)
+            this.tableList = list
+            var total = response.data.data.total
+            this.total = total
+          }
+       })
+     },
+     getName(id){
+       var name = ""
+       for(let i=0;i<this.supplyList.length;i++){
+         if(id == this.supplyList[i].id){
+           name = this.supplyList[i].supplier_name
+         }
+       }
+       return name
+     },
+     getDocName(id){
+      var user_name = ""
+      for(let i=0;i<this.doctorList.length;i++){
+        if(id == this.doctorList[i].admin_user_id){
+          user_name = this.doctorList[i].user_name
+        }
+      }
+      return user_name
+     },
+     getAllBuyPrice(arr){
+       var buy_price = 0
+       if(arr!=undefined && arr.length > 0){
+          for(let i=0;i<arr.length;i++){
+            buy_price += (arr[i].count * arr[i].price)
+          }
+       }
+       return buy_price.toFixed(2)
+     },
+     getAllCount(arr){
+       var count = ""
+        if(arr!=undefined && arr.length > 0){
+          for(let i=0;i<arr.length;i++){
+            count += arr[i].count
+          }
+       }
+       return count
+     },
+     toClick(id){
+       this.$router.push({path:"/purchase/order/edit?id="+id})
+     }
+  },
+  created() {
+    var now = new Date(); //当前日期 
+    var nowMonth = now.getMonth(); //当前月 
+    var nowYear = now.getFullYear(); //当前年 
+    //本月的开始时间
+    var monthStartDate = new Date(nowYear, nowMonth, 1); 
+    this.start_time = monthStartDate
+    this.org_id =  this.$store.getters.xt_user.org_id
+    this.getAllSupply()
+    this.getlist()
+  },
+ 
 };
 </script>
 
@@ -290,4 +380,5 @@ export default {
 .el-table::before {
   background-color: #d0d3da;
 }
+
 </style>

src/xt_pages/supply/supplyQuery.vue

@@ -80,7 +80,7 @@
         </el-table-column>
         <el-table-column label="供应商编码" align="center">
           <template slot-scope="scope">
-          
+
           </template>
         </el-table-column>
         <el-table-column label="供应商名称" align="center">
@@ -90,41 +90,41 @@
          </el-table-column>
         <el-table-column label="首要联系人" align="center">
           <template slot-scope="scope">
-            
+
           </template>
         </el-table-column>
         <el-table-column label="增值税税率(%)" align="center">
           <template slot-scope="scope">
-           
+
           </template>
         </el-table-column>
        <el-table-column label="银行账号" align="center">
          <template slot-scope="scope">
-           
+
          </template>
        </el-table-column>
-       <el-table-column label="开户银行" align="center" v-if="showOne">
+       <el-table-column label="开户银行" align="center">
          <template slot-scope="scope">
-         
+
           </span>
-        
+
          </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>
        </el-table-column>
 
-    
+
 
        <el-table-column label="操作" align="center" width="260px">
           <template slot-scope="scope">
@@ -212,9 +212,27 @@ export default {
   },
   methods:{
      toAdd(){
-       console.log("res32323232323223",this.$refs)  
-       this.$refs.addSupply.show()  
-     } 
+       // console.log("res32323232323223",this.$refs)
+       this.$refs.addSupply.show()
+     },
+      changeTypeName(){
+
+     },
+     startTimeChange(){
+
+     },
+     endTimeChange(){
+
+     },
+     search(){
+
+     },
+     handleSizeChange(){
+
+     },
+     handleCurrentChange(){
+
+     }
   }
 };
 </script>