11月14日 库存扣减更新

src/router/modules/supply.js

@@ -66,6 +66,15 @@ export default {
       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/stock/drugs/components/drugOutDetail.vue

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

src/xt_pages/stock/drugs/drugStockFlow.vue

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

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

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

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

@@ -97,7 +97,24 @@
         <template slot-scope="scope">
             <el-input v-model="scope.row.supply_specification_name" style="width:150px" :disabled="true"></el-input>
         </template>
-        </el-table-column>
+    </el-table-column>
+     <el-table-column label="单位" align="center" width="120px">
+        <template slot="header" slot-scope="scope">
+            <span>单位<span style="color: red">*</span></span>
+        </template>
+        <template slot-scope="scope">
+          <el-form-item :prop="'tableList.' + scope.$index + '.supply_unit'" :rules='tableRules.supply_unit'>
+            <el-select v-model="scope.row.supply_unit" style="width:100px;" filterable placeholder="请选择"  :disabled="disabled">
+                    <el-option
+                        v-for="(item,index) in scope.row.unitList"
+                        :key="index"
+                        :label="item.name"
+                        :value="item.name">
+                    </el-option>
+             </el-select>
+          </el-form-item>  
+        </template>
+    </el-table-column>
     <el-table-column label="可用库存" align="center" width="130px">
         <template slot-scope="scope">
             <el-input v-model="scope.row.supply_total" style="width:100px" :disabled="true"></el-input>
@@ -114,21 +131,7 @@
         </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-select v-model="scope.row.supply_unit" style="width:160px;" filterable placeholder="请选择"  :disabled="disabled">
-                <el-option
-                    v-for="(item,index) in unitList"
-                    :key="index"
-                    :label="item.name"
-                    :value="item.name">
-                </el-option>
-            </el-select>
-        </template>
-    </el-table-column>
+   
 
     <el-table-column label="购货单价" align="center" width="120px">
         <template slot-scope="scope">
@@ -201,6 +204,7 @@
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import {uParseTime } from '@/utils/tools'
 import {getInitOrder,savePurchaseOrder,updatePurchaseOrder,checkPurchaseOrder} from "@/api/supply"
+import {getDataConfig } from '@/utils/data'
 export default {
 name: "addPurchaseOrder",
 created() {
@@ -262,6 +266,7 @@ return {
     tableRules: {
      name: [{ required: true, message: '商品不能为空', trigger: 'blur' }],
      supply_count: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
+     supply_unit:[{required:true,message: '单位不能为空', trigger: 'blur'}]
    },
    warehousing_id:0,
    number:"",
@@ -274,6 +279,9 @@ return {
      {id:1,name:""},
      {id:2,name:""}
    ],
+   goodList:[
+     {id:1,name:""},
+   ],
   };
 },
 methods:{
@@ -312,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
@@ -333,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 = ""
@@ -342,7 +357,11 @@ getInitOrder(){
         goodList[i].supply_remake = ""
         goodList[i].type = 2
         goodList[i].name = goodList[i].good_name
-
+        goodList[i].supply_unit = goodList[i].packing_unit
+        goodList[i].unitList =  [{id:1,name:""},{id:2,name:""}]
+        for(let j=0;j<goodList[i].unitList.length;j++){
+           goodList[i].unitList[0].name = goodList[i].packing_unit 
+        }
         this.tabList.push(goodList[i])
         }
         this.goodList = goodList
@@ -363,7 +382,7 @@ changeName(val){
         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
-        this.recordInfo.tableList[i].supply_unit = val.max_unit
+        
         if(val.supply_count == NaN){
            this.recordInfo.tableList[i].supply_count = ""
         }else{
@@ -377,6 +396,7 @@ changeName(val){
         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
      }
     }
    
@@ -416,6 +436,7 @@ savePurchaseOrder(){
     this.loading = true
     if(this.supplier_name == 0 || this.supplier_name == ""){
        this.$message.error("供应商不能为空!")
+       this.loading = false
        return false
     }
     this.$refs["tableForm"].validate((valid)=>{
@@ -450,11 +471,29 @@ savePurchaseOrder(){
                 this.recordInfo.tableList = []
                 var orderInfo = response.data.data.orderInfo
                 for(let i=0;i<orderInfo.length;i++){
+                   if(orderInfo[i].is_source == 1){
+                    for(let j=0;j<this.drugList.length;j++){
+                       if(orderInfo[i].project_id == this.drugList[j].id){
+                          orderInfo[i].unitList = [{id:1,name:""},{id:2,name:""}]
+                          orderInfo[i].unitList[0].name = this.drugList[j].max_unit
+                          orderInfo[i].unitList[1].name = this.drugList[j].min_unit
+                       }
+                    }  
+                   } 
+                  if(orderInfo[i].is_source == 2){
+                    for(let j=0;j<this.goodList.length;j++){
+                       if(orderInfo[i].project_id == this.goodList[j].id){
+                          orderInfo[i].unitList = [{id:1,name:""}]
+                          orderInfo[i].unitList[0].name = this.goodList[j].packing_unit
+                       }
+                    }  
+                   } 
                   orderInfo[i].supply_count = orderInfo[i].count
                   orderInfo[i].supply_price = orderInfo[i].price
                   orderInfo[i].supply_remake = orderInfo[i].remark
                   orderInfo[i].type = orderInfo[i].is_source
                   orderInfo[i].project_id = orderInfo[i].project_id
+                  orderInfo[i].supply_unit = orderInfo[i].supply_unit
                 }
                 console.log("orderINFO23323232",orderInfo)
                 this.recordInfo.tableList = orderInfo
@@ -551,6 +590,11 @@ getTimes(time) {
 },
  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++){
@@ -610,7 +654,10 @@ getTimes(time) {
   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 = {}

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -48,7 +48,7 @@
 
     </div>
     <div>
-        <el-button size="small" type="primary" @click="checkPurchaseOrder">生成购货单</el-button>
+        <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>
@@ -99,7 +99,34 @@
         <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>
+        </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>
@@ -128,7 +155,12 @@
         </template>
     </el-table-column>
 
-    <el-table-column label="生产厂商" align="center" width="200px">
+    <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>
@@ -140,7 +172,11 @@
         <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>
@@ -178,8 +214,24 @@
 
         <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>
 
@@ -189,21 +241,6 @@ import {uParseTime } from '@/utils/tools'
 import {getInitOrder,updatePurchaseOrder,checkPurchaseOrder,getPurchaseOrderDetail} from "@/api/supply"
 export default {
 name: "addPurchaseOrder",
-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
 },
@@ -257,6 +294,7 @@ return {
    id:0,
    disabled:false,
    is_check:0,
+   dialogVisible:false,
   };
 },
 methods:{
@@ -293,9 +331,14 @@ 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].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
@@ -314,7 +357,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 = ""
@@ -323,7 +366,11 @@ getInitOrder(){
         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
@@ -356,6 +403,8 @@ changeName(val){
         this.recordInfo.tableList[i].supply_license_number = val.supply_license_number
         this.recordInfo.tableList[i].supply_remake = val.supply_remake
         this.recordInfo.tableList[i].is_total = val.is_total
+        this.recordInfo.tableList[i].supply_unit = val.supply_unit
+        this.recordInfo.tableList[i].unitList = val.unitList
      }
     }
    
@@ -378,6 +427,7 @@ handleEdit(){
     tempObj['type'] = 0
     tempObj['is_total'] = 1
     tempObj["project_id"] = 0
+    tempObj["supply_unit"] = ""
     this.recordInfo.tableList.push(tempObj)
 },
 handleDelete: function(index, row) {
@@ -452,6 +502,11 @@ getTimes(time) {
 },
  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++){
@@ -471,7 +526,8 @@ getTimes(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
@@ -500,6 +556,7 @@ getTimes(time) {
           var info = response.data.data.info
           this.disabled = true
           this.$message.success("审核成功!")
+          this.getPurchaseOrderDetail()
         } 
      })
     })
@@ -524,12 +581,33 @@ getTimes(time) {
         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
@@ -539,6 +617,14 @@ getTimes(time) {
   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(){
@@ -558,6 +644,7 @@ created(){
     tempObj['type'] = 0
     tempObj['is_total'] = 1
     tempObj["project_id"] = 0
+    tempObj["supply_unit"] = ""
     this.recordInfo.tableList.push(tempObj)
     this.getInitOrder()
     this.getPurchaseOrderDetail()

src/xt_pages/supply/components/purchaseOrderPrint.vue

@@ -48,13 +48,13 @@
                             <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.supply_name}}</span></td>
-                                    <td style="line-height:18px;"><span></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></span></td>
-                                    <td style="line-height:18px;"><span></span></td>
-                                    <td style="line-height:18px;"><span></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>

src/xt_pages/supply/goodOrderQuery.vue

@@ -75,12 +75,12 @@
         :class="signAndWeighBoxPatients"
         border
       >
-        <el-table-column label="订单日期" align="center">
+        <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">
+        <el-table-column label="单据编号" align="center">
           <template slot-scope="scope">
             <span>{{scope.row.number}}</span>
           </template>
@@ -90,17 +90,26 @@
               <span>{{getName(scope.row.supplier_id)}}</span>
             </template>
          </el-table-column>
-        <el-table-column label="关联购货订单" align="center">
+        <el-table-column label="关联购货订单号" align="center" width="200">
           <template slot-scope="scope">
             
           </template>
         </el-table-column>
-        <el-table-column label="购物金额" align="center">
+        <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)}}
@@ -114,13 +123,7 @@
          </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)}}