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

     url: '/api/supply/getallgoodreturnorderlist',
     method: 'get',
     params: params
+  })}
+
+
+  export function getSupplierId(params) {
+    return request({
+      url: '/api/supply/getsupplycode',
+      method: 'get',
+      params: params
+    })
+  }
+
+  export function getsupplytype(params) {
+    return request({
+      url: '/api/supply/getsupplytype',
+      method: 'get',
+      params: params
+    })
+  }
+
+  export function getGoodReturnDetail(id, params) {
+    return request({
+      url: '/api/supply/getgoodreturndetail?id=' + id,
+      method: 'get',
+      params: params
+    })}
+
+
+    export function getexporthistory(params) {
+      return request({
+        url: '/api/supply/getsupplylist',
+        method: 'get',
+        params: params
+      })
+    }
+
+    export function delsupplys(id, data) {
+      return request({
+        url: '/api/supply/delsupply?id=' + id,
+        method: 'post',
+        data: data
+      })
+    }
+
+    export function getsupplyandcontactone(params) {
+      return request({
+        url: '/api/supply/getsupplyandcontactone',
+        method: 'get',
+        params: params
+      })
+    }
+
+export function updateGoodReturn(data, warehouse_out_id, start_time, rate_of_concession, discount_amount, arrearage, payment, supplier_id, return_number) {
+  return request({
+    url: '/api/supply/updategoodreturn?warehouse_out_id=' + warehouse_out_id + '&start=' + start_time + '&rate_of_concession=' + rate_of_concession + '&discount_amount=' + discount_amount + '&arrerage=' + arrearage + '&payment=' + payment + '&supplier_id=' + supplier_id + '&return_number=' + return_number,
+    method: 'post',
+    data: data
   })
 }
 
-export function getGoodReturnDetail(id, params) {
+export function MofyGoodOrder(params) {
   return request({
-    url: '/api/supply/getgoodreturndetail?id=' + id,
+    url: '/api/supply/mofygoodorder',
     method: 'get',
     params: params
   })
 }
 
-export function updateGoodReturn(data, warehouse_out_id, start_time, rate_of_concession, discount_amount, arrearage, payment, supplier_id, return_number) {
+export function UpdateSupplyWahouseingInfo(params) {
   return request({
-    url: '/api/supply/updategoodreturn?warehouse_out_id=' + warehouse_out_id + '&start=' + start_time + '&rate_of_concession=' + rate_of_concession + '&discount_amount=' + discount_amount + '&arrerage=' + arrearage + '&payment=' + payment + '&supplier_id=' + supplier_id + '&return_number=' + return_number,
-    method: 'post',
-    data: data
+    url: '/api/supply/updatesupplywarehousing',
+    method: 'get',
+    params: params
+  })
+}
+
+export function deleteGoodOrder(id, params) {
+  return request({
+    url: '/api/supply/deletegoodorder?id=' + id,
+    method: 'get',
+    params: params
   })
 }

src/components/Popup/index.js

+import Vue from 'vue'
+import Popup from './index.vue'
+
+const PopupBox = Vue.extend(Popup)
+
+Popup.install = function (data) {
+  let instance = new PopupBox({
+    data
+  }).$mount()
+
+  document.body.appendChild(instance.$el)
+
+  Vue.nextTick(() => {
+    instance.show = true
+    // show 和弹窗组件里的show对应，用于控制显隐
+    setTimeout(() => {
+      instance.show = false
+    }, 3000);
+  })
+}
+
+export default Popup

src/components/Popup/index.vue

+<template>
+  <transition-group name="fade">
+    <!-- 蒙版 -->
+    <div
+      class="mask"
+      key="1"
+      @click="show = false"
+      v-if="show"
+      @touchmove.prevent
+    ></div>
+    <div class="pop" v-show="show" key="2">
+      <div class="title">
+        <span>{{ title }}</span>
+      </div>
+
+      <div class="content">
+        <div class="content_1">
+          <img
+            src="../../assets/Popup/alert.png"
+            alt="正在加载.."
+            class="alertImg"
+          />
+        </div>
+
+        <div class="content_2">
+          <p>
+            购货订单<span style="color: #46a3ff">{{ content }}</span
+            >已有以下关联数据,不能反审核
+          </p>
+          <div v-for="(item, index) in orderList" :key="index">
+            <li>
+              购货单 {{ item.good_number
+              }}<a @click="toClick(item.id)">点击查看</a>
+            </li>
+          </div>
+        </div>
+      </div>
+
+      <div class="btn">
+        <el-button @click="btnClick">{{ btnText }}</el-button>
+      </div>
+    </div>
+  </transition-group>
+</template>
+
+<script>
+export default {
+  name: "Popup",
+  data() {
+    return {
+      show: false,
+      imgUrl: "",
+      title: "系统提示",
+      content: "",
+      btnText: "关闭",
+      orderList: [],
+    };
+  },
+  created() {},
+  methods: {
+    btnClick() {
+      this.click();
+      this.show = false;
+    },
+    toClick(id) {
+      this.$router.push("/good/order/edit?id=" + id);
+    },
+  },
+};
+</script>
+
+
+<style lang="scss" scoped>
+// 渐变过渡
+.fade-enter,
+.fade-leave-active {
+  opacity: 0;
+}
+.fade-enter-active,
+.fade-leave-active {
+  transition: opacity 0.35s;
+}
+// 全局弹窗
+.mask {
+  background: rgba(0, 0, 0, 0.5);
+  position: fixed;
+  top: 0;
+  z-index: 10;
+  width: 100%;
+  height: 100%;
+}
+
+.pop {
+  height: 205px;
+  width: 435px;
+  background: #fff;
+  border-radius: 8px;
+  position: fixed;
+  top: 100px;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 20;
+  text-align: center;
+  .title {
+    height: 40px;
+    line-height: 40px;
+    span {
+      float: left;
+      margin-left: 15px;
+    }
+  }
+  .content {
+    height: 125px;
+    display: flex;
+    .content_1 {
+      width: 20%;
+      .alertImg {
+        width: 45px;
+        height: 45px;
+      }
+    }
+
+    .content_2 {
+      p {
+        line-height: 43px !important;
+        text-align: left !important;
+      }
+
+      li {
+        list-style: disc;
+        text-align: left;
+        a {
+          float: right;
+          margin-right: 60px;
+        }
+      }
+    }
+  }
+
+  .btn {
+    height: 40px;
+    line-height: 40px;
+    button {
+      float: right;
+      margin-right: 15px;
+    }
+  }
+  // button {
+  //   background: #f95644;
+  //   border-radius: 32px;
+  //   width: 30px;
+  //   height: 20px;
+  //   font-size: 18px;
+  //   color: #ffffff;
+  // }
+  .close {
+    top: 0;
+    right: 10px;
+    position: absolute;
+    display: block;
+    width: 40px;
+    height: 40px;
+  }
+}
+</style>

src/main.js

 import 'default-passive-events'
 Vue.prototype.voicePrompt = voicePromptFun.voicePrompt  //语音提醒
 
+import Popup from "./components/Popup/index"  //全局删除弹框控件
+Vue.prototype.$popup = Popup.install
+
+import Computed from "../src/xt_pages/components/Computed/index"  //自动计算金额控件
+Vue.component("Computed",Computed)
+
+
+
 Vue.use(Element, {
   size: 'medium', // set element-ui default size
   i18n: (key, value) => i18n.t(key, value)

src/router/modules/supply.js

       meta: { title: 'addSupply', noCache: true },
       isChild: true
     },
+    {
+      path: '/supply/edit',
+      component: () => import('@/xt_pages/supply/components/editSupply'),
+      name: 'editSupply',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'editSupply', noCache: true },
+      isChild: true
+    },
     {
       path: 'purchase/order/query',
       component: () => import('@/xt_pages/supply/purchaseOrderQuery'),

src/views/layout/Layout.vue

           <i class="iconfont icon-computer_fill navIcon"></i>
           <p>透析管理</p>
         </div>
-        <!-- <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
+        <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
           <i class="iconfont icon-kccx navIcon"></i>
           <p>采购管理</p>
-        </div> -->
+        </div>
         <div v-if="kucunShow" :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库房管理')">
           <i class="iconfont icon-kccx navIcon"></i>
           <p>库房管理</p>

src/xt_pages/components/Computed/index.vue

+<template>
+  <div>
+    <div style="margin-top: 10px">合计: {{ new_total || total_money }}元</div>
+    <div style="margin-top: 10px">
+      <span
+        >优惠率:<el-input
+          style="width: 100px"
+          v-model="rate_of_concession"
+          @input="addressChange"
+        ></el-input
+        >%</span
+      >
+
+      <span
+        >优惠金额:<el-input
+          style="width: 100px"
+          v-model="discount_amount"
+          @input="count_discount"
+        ></el-input
+      ></span>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    total_price: {
+      type: Number,
+      default: 1000,
+    },
+  },
+  data() {
+    return {
+      rate_of_concession: 0,
+      discount_amount: 0,
+      total_money: this.$props.total_price,
+      new_total: 0,
+    };
+  },
+  created() {
+    this.addressChange();
+  },
+
+  methods: {
+    addressChange() {
+      this.new_total = (this.total_money * (100 - this.rate_of_concession) * 0.01).toFixed(2);
+      this.discount_amount = (this.total_money - this.new_total).toFixed(2);
+     console.log(this.discount_amount)
+    },
+
+    count_discount() {
+      this.rate_of_concession =
+      (this.discount_amount / (this.total_money * 0.01)).toFixed(2);
+      this.new_total = this.total_money - this.discount_amount;
+    },
+  },
+};
+</script>
+
+<style scoped>
+</style>

src/xt_pages/components/Computed/index_1.vue

+<template>
+  <div>
+    <div style="margin-top: 10px">合计: {{ new_total || total_money }}元</div>
+    <div style="margin-top: 10px">
+      <span
+        >优惠率:<el-input
+          style="width: 100px"
+          v-model="rate_of_concession"
+          @input="addressChange"
+        ></el-input
+        >%</span
+      >
+
+      <span
+        >优惠金额:<el-input
+          style="width: 100px"
+          v-model="discount_amount"
+          @input="count_discount"
+        ></el-input
+      ></span>
+
+      <span
+        >本次付款:<el-input
+          style="width: 100px"
+          v-model="payment"
+          @input="count_payment"
+        ></el-input
+      ></span>
+
+      <span
+        >本次欠款:<el-input
+          style="width: 100px"
+          v-model="arrearage"
+          @input="count_arrearage"
+        ></el-input
+      ></span>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    total_price: {
+      type: Number,
+      default: 1000,
+    },
+  },
+  data() {
+    return {
+      rate_of_concession: 0,
+      discount_amount: 0,
+      total_money: this.$props.total_price,
+      new_total: 0,
+      payment:0,
+      arrearage:0
+    };
+  },
+  created() {
+    this.addressChange();
+  },
+
+  methods: {
+    addressChange() {
+      this.new_total = (
+        this.total_money *
+        (100 - this.rate_of_concession) *
+        0.01
+      ).toFixed(2);
+      this.discount_amount = (this.total_money - this.new_total).toFixed(2);
+      console.log(this.discount_amount);
+    },
+
+    count_discount() {
+      this.rate_of_concession = (
+        this.discount_amount /
+        (this.total_money * 0.01)
+      ).toFixed(2);
+      this.new_total = this.total_money - this.discount_amount;
+    },
+    count_payment() {
+        if(this.new_total){
+            this.arrearage = this.new_total - this.payment
+        }
+
+    },
+
+    count_arrearage() {
+         if(this.new_total){
+            this.payment = this.new_total - this.arrearage
+        }
+
+    },
+  },
+};
+</script>
+
+<style scoped>
+</style>

src/xt_pages/data/components/addDrugs.vue

                             <el-input v-model="form.social_security_directory_code" style="width:160px"></el-input>
                         </el-form-item>
 
-
+                      
 
                         <el-form-item label="备案日期:">
                             <el-date-picker
                                     placeholder="选择日期时间">
                             </el-date-picker>
                         </el-form-item>
+                      
+                        <!-- <el-form-item label="是否零用:">
+
+                            <el-select v-model="form.is_user" style="width:160px" filterable placeholder="请选择">
+                                <el-option
+                                        v-for="(item,index) in userList"
+                                        :key="index"
+                                        :label="item.name"
+                                        :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </el-form-item> -->
+                      
 
                         <el-form-item label="药品备注:">
                             <el-input v-model="form.drug_remark" style="width:160px"></el-input>
           prescribing_number_unit:"",
           total:"",
           specification_name:"",
+          is_user:2,
         },
 
         rules: {
         dosageShow:false,
         unitList:[],
         minNumberShow:false,
-        packingUnit:[]
+        packingUnit:[],
+        userList: [{
+          id: '1',
+          name: '是'
+        }, {
+          id: '2',
+          name: '否'
+        }],
       }
     },
     props: {
         form['min_price'] = this.form.min_price
         form['prescribing_number_unit'] = this.form.prescribing_number_unit
         form['specification_name'] = this.form.specification_name
+        form['is_user'] = this.form.is_user
         return form
       },
       getlist() {

src/xt_pages/data/components/drugs.vue

           min_price:'',
           drug_day:"",//默认开药天数,
           total:"",
+          is_user:"",
         },
         tempFormValue: {
           drug_name: '',//药品名称
           packing_price:"",//包装零售价
           drug_day:"",//默认开药天数
           total:"",
-
+          is_user:"",
         },
 
         current_id: 0,
 
               }
 
+              // if(this.formValue.is_user <= 0){
+
+              //   this.formValue.is_user = ''
+              // } else{
+              //   this.formValue.is_user = this.formValue.is_user.toString()
+              // }
+
+
               if(this.formValue.is_charge_predict <= 0){
 
                 this.formValue.is_charge_predict = ''

src/xt_pages/outpatientCharges/components/registerDialog.vue

                   }).catch(() => {
                   })
                 } else {
+                  that.InsuplcAdmdvs = []
                   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,

src/xt_pages/outpatientCharges/components/registerDialog9504.vue

         let params = {
           'id_card_type': this.form.id_card_type,
           'admin_user_id':this.$store.getters.xt_user.user.id,
+          'certificates': this.form.certificates
 
         }
         this.read_loading = true

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

         { value: 11, label: '普通门诊' },
         { value: 14, label: '门诊特殊病' },
         { value: '1111', label: '精一' },
-        { value: '1112', label: '精二' }
+        { value: '1112', label: '精二' },
+        { value: '9922', label: '家庭通道' }
+
       ],
 
       registerThree: [
         { value: '1112', label: '精二' },
         { value: '9933', label: '门诊特殊病(9933)' },
         { value: '990602', label: '门诊特殊病(990602)' },
-        { value: '1402', label: '门诊特殊病(1402)' }
+        { value: '1402', label: '门诊特殊病(1402)' },
+        { value: '1402', label: '门诊特殊病(1402)' },
+        { value: '9922', label: '家庭通道' }
+
+
 
       ],
       register_two: [
         { value: '14', label: '门诊特殊病' },
         { value: '9933', label: '门诊特殊病(9933)' },
         { value: '990602', label: '门诊特殊病(990602)' },
-        { value: '1402', label: '门诊特殊病(1402)' }
+        { value: '1402', label: '门诊特殊病(1402)' },
+        { value: '9922', label: '家庭通道' }
+
 
       ],
       loading: false,
           this.$message({ message: '该患者尚未挂号,请先挂号', type: 'error' })
           return
         }
+        console.log( "-------")
+        console.log(this.getTotalFour(prescriptions))
+        console.log( this.currentOrder)
+        console.log( this.hisPatientInfo)
+
 
         if (this.hisPatientInfo.id_card_type == 1) {
           if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188) {
 
           }
         } else {
+
           if (this.activeName == 'first') {
             this.$refs.charge.show(this.getTotalFour(prescriptions), this.currentOrder)
           } else {

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

 <template>
   <div id="statement-print" class="statement-print">
     <div class="statementTitle" v-if="info.fixmedins_code == 'H32092103007'">江苏省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="info.fixmedins_code == 'H42138100547'">广水源生堂社会医疗保险医疗费用结算单</div>
+
     <div class="statementTitle" v-else>广东省社会医疗保险医疗费用结算单</div>
 
     <table class="statementTable" border="1">

src/xt_pages/stock/detail/print.vue

               <td style="line-height: 50px">
                 <span v-if="type == 1"> {{ item.warehousing_count }}</span>
                 <span v-if="type == 2"> 
-                  <span  v-if= "org_id == 3907 || org_id ==9919">{{getStockCount(item.good_id) }}</span>  
+                  <span  v-if= "org_id == 3907 || org_id == 9919 || org_id == 9583">{{getStockCount(item.good_id) }}</span>  
                   <span v-else>{{item.count}}</span>
                 </span>
                

src/xt_pages/supply/components/addGoodOrder.vue

     </el-table-column>
     <el-table-column label="生产厂家" align="center" width="200px">
         <template slot-scope="scope">
-         <el-select size="small" v-model="scope.row.supply_manufacturer" filterable placeholder="请选择厂家" :disabled="true">
+         <el-select size="small" v-model="scope.row.supply_manufacturer" filterable  :disabled="true">
                 <el-option
                   v-for="(option, index) in manufactuerList"
                   :key="index"
     </el-table-column>
   </el-table>
 </el-form>
-   <div style="margin-top:10px">
+   <!-- <div style="margin-top:10px">
       合计:{{getAllPrice()}} 元
    </div>
    <div style="margin-top:10px">
         <span>本次付款:<el-input style="width:100px" v-model="payment"></el-input></span>
 
         <span>本次欠款:<el-input style="width:100px" v-model="arrearage"></el-input></span>
-    </div>
+    </div> -->
+    <Computed :total="total_price" :rate_of_concession="rate_of_concession" :discount_amount="discount_amount"></Computed>
 </div>
 
   <!-- <el-dialog
 </template>
 
 <script>
+import Computed from "../../components/Computed/index_1.vue"
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import {uParseTime } from '@/utils/tools'
 import {getInitOrder,checkPurchaseOrder,getPurchaseOrderInfo,addGoodOrder,updateGoodOrder} from "@/api/supply"
 export default {
 name: "addPurchaseOrder",
 components: {
-BreadCrumb
+BreadCrumb,
+Computed
 },
 data() {
 return {
     drugTypeList:[],
     supplier_name:"",
     supplyList:[],
+    total_price:0,
     rate_of_concession:"",
     discount_amount:"",
     start_time:"",

src/xt_pages/supply/components/addPurchaseOrder.vue

       >
         <div>
           <span style="color: red">*</span><span>供应商:</span>
-          <el-select
+          <el-select cxpib`*+9.`
             v-model="supplier_name"
             style="width: 140px; margin-right: 10px"
             placeholder="请选择"
                   v-model="scope.row.name"
                   style="width: 160px"
                   filterable
-                  placeholder="请选择"
+                  placeholder="请选择商品"
                   @change="changeName"
                   @input="changeGoodName(scope.$index)"
                   :disabled="disabled"
                 v-model="scope.row.supply_type"
                 style="width: 120px"
                 :disabled="true"
+                 placeholder="商品类别"
               ></el-input>
               <div style="visibility: hidden">/</div>
             </template>
           <el-table-column label="规格&单位" align="center" width="200px">
             <template slot-scope="scope">
               <el-input
+                placeholder="规格&单位"
                 v-model="scope.row.supply_specification_name"
                 style="width: 150px"
                 :disabled="true"
               <el-form-item
                 :prop="'tableList.' + scope.$index + '.supply_count'"
                 :rules="tableRules.supply_count"
+                 placeholder="请输入数量"
               >
                 <el-input
                   v-model="scope.row.supply_count"
             </template>
           </el-table-column>
 
-          <el-table-column label="购货单价" align="center" width="120px">
+          <el-table-column label="购货单价" align="center" width="140px">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.supply_price"
                 style="width: 80px"
                 :disabled="disabled"
+                 placeholder="请输入购货单价"
               ></el-input>
               <div style="visibility: hidden">/</div>
             </template>
                 size="small"
                 v-model="scope.row.supply_manufacturer"
                 filterable
-                placeholder="请选择生产厂家"
                 :disabled="true"
               >
                 <el-option
                 v-model="scope.row.supply_remake"
                 style="width: 160px"
                 :disabled="disabled"
+                placeholder="请输入备注"
               ></el-input>
               <div style="visibility: hidden">/</div>
             </template>
             style="width: 100px"
             v-model="rate_of_concession"
             @input="addressChange"
+            @placeholder="请输入优惠率"
           ></el-input
           >%</span
         >
           >优惠金额:<el-input
             style="width: 100px"
             v-model="discount_amount"
+            @placeholder="请输入优惠金额"
           ></el-input
         ></span>
       </div>

src/xt_pages/supply/components/addSupply.vue

 <template>
-  <el-dialog title="新增供应商" :visible.sync="dialogVisible" width="35%">
+  <el-dialog :title="title" :visible.sync="dialogVisible" width="35%">
     <!-- :before-close="handleClose" 如需要可添加进上方 -->
     <div>
       <el-form
       >
         <el-row>
           <el-col span="6">
-            <el-form-item label="供应商编码" prop="id">
-              <el-input v-model="supplier.id"></el-input>
+            <el-form-item label="供应商编码" prop="supplierCode">
+              <el-input v-model="supplier.supplierCode"></el-input>
             </el-form-item>
           </el-col>
           <el-col span="6">
-            <el-form-item label="供应商名称" prop="name">
-              <el-input v-model="supplier.name"></el-input>
+            <el-form-item label="供应商名称" prop="supplierName">
+              <el-input v-model="supplier.supplierName"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col span="6">
-            <el-form-item label="供应商类别">
-              <el-input v-model="supplier.type"></el-input>
+            <el-form-item label="供应商类别" prop="supplierType">
+              <!-- <el-input v-model="supplier.type"></el-input> -->
+              <el-autocomplete
+                v-model="supplier.supplierType"
+                :fetch-suggestions="querySearchAsync"
+                @select="handleSelect"
+              ></el-autocomplete>
             </el-form-item>
           </el-col>
           <el-col span="6">
-            <el-form-item label="增值税税率">
-              <el-input v-model="supplier.rate"></el-input>
+            <el-form-item label="增值税税率" prop="vatRate">
+              <el-input v-model="supplier.vatRate"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col span="6">
-            <el-form-item label="纳税人识别号">
-              <el-input v-model="supplier.taxerId"></el-input>
+            <el-form-item label="纳税人识别号" prop="number">
+              <el-input v-model="supplier.number"></el-input>
             </el-form-item>
           </el-col>
           <el-col span="6">
-            <el-form-item label="开户银行">
-              <el-input v-model="supplier.bankname"></el-input>
+            <el-form-item label="开户银行" prop="bank">
+              <el-input v-model="supplier.bank"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col span="6">
-            <el-form-item label="银行账号">
-              <el-input v-model="supplier.bankId"></el-input>
+            <el-form-item label="银行账号" prop="bankAccount">
+              <el-input v-model="supplier.bankAccount"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
                 :rules="tableRules.contacts"
               >
                 <el-input
-                  v-model="scope.row.supply_count"
+                  v-model="scope.row.name"
                   style="width: 80px; margin-top: 3px"
                 ></el-input>
               </el-form-item>
           <el-table-column label="手机" align="center" width="100px">
             <template slot-scope="scope">
               <el-input
-                v-model="scope.row.supply_price"
+                v-model="scope.row.phone"
                 style="width: 80px"
               ></el-input>
               <div style="visibility: hidden">/</div>
           <el-table-column label="联系地址" align="center" width="130px">
             <template slot-scope="scope">
               <el-input
-                v-model="scope.row.supply_license_number"
+                v-model="scope.row.address"
                 style="width: 115px"
               ></el-input>
               <div style="visibility: hidden">/</div>
               <el-form-item :prop="'tableList.' + scope.$index + '.name'">
                 <!-- :prop="'tableList.' + scope.$index + '.name'"  如需添加可在上方标签加入 -->
                 <el-select
-                  v-model="scope.row.name"
+                  v-model="scope.row.is_first"
                   style="width: 90px"
                   placeholder="请选择"
                   @change="changeName($event, scope)"
     </div>
 
     <span slot="footer" class="dialog-footer">
-      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button @click="closePop">取 消</el-button>
       <el-button type="primary" @click="submitForm('supplier')"
         >确 定</el-button
       >
 </template>
 
 <script>
+import {
+  getSupplierId,
+  getsupplytype,
+  getsupplyandcontactone,
+} from "@/api/supply";
 import Template from "../../data/template.vue";
 export default {
   data() {
     return {
+      title: "",
       Template,
       signAndWeighBoxPatients: "sign-and-weigh-box-patients",
       list: ["001", "002"],
       value: "",
       dialogVisible: false,
       supplier: {
-        name: "",
-        id: "",
-        type: "",
-        rate: 10,
-        taxerId: "",
-        bankId: "",
-        bankname: "",
+        supplierName: "a",
+        supplierCode: "gsy001",
+        supplierType: "",
+        vatRate: 10,
+        number: "",
+        bank: "",
+        bankAccount: "",
       },
+      supply_code: [],
+      select_supply: [],
+      type: "",
+      timeout: null,
+      id: "",
+      name: "",
     };
   },
-  created() {
-    this.supplier.id = "gys001";
-    this.getcontacts();
-  },
+  created() {},
   methods: {
-    show() {
-      this.dialogVisible = true;
+    show(data, type) {
+      if (type == 1) {
+        this.initSupplierData();
+        this.title = "新增供应商";
+        this.dialogVisible = true;
+      } else if (type == 2) {
+        this.title = "编辑供应商";
+        this.supplier.supplierCode = data.SupplierCode;
+        this.supplier.supplierName = data.SupplierName;
+        this.supplier.supplierType = data.SupplierType;
+        this.supplier.vatRate = data.VatRate;
+        this.supplier.number = data.Number;
+        this.supplier.bank = data.Bank;
+        this.supplier.bankAccount = data.BankAccount;
+        this.getcontacts(data.ID);
+        this.dialogVisible = true;
+      }
+    },
+    closePop() {
+      this.dialogVisible = false;
+      this.supply_code = [];
+      this.supplier.supplierCode = "";
+      this.supplier.supplierName = "";
+      this.supplier.supplierType = "";
+      this.supplier.vatRate = "";
+      this.supplier.number = "";
+      this.supplier.bank = "";
+      this.supplier.bankAccount = "";
+      this.recordInfo.tableList = [{}];
+    },
+
+    // 获取供应商编码接口
+    initSupplierData() {
+      let Arr = [];
+      getSupplierId().then((res) => {
+        Arr = res.data.data;
+        Arr.supplycode.forEach((o) => {
+          this.supply_code.push(o.supplier_code);
+        });
+      });
       this.orderIdAdd();
-      // this.continueArr();
     },
+
+    // 供应商编码动态递增
+    orderIdAdd() {
+      let data = this.supply_code;
+      let len = 3;
+      data.forEach((o, index) => {
+        o = o.split("gsy");
+        index = index + 1;
+        let index1 = index;
+        index1 = parseInt(index1, 10);
+        index1 = index1.toString();
+        while (index1.length < len) index1 = "0" + index1;
+        if (o[1] != index1) {
+          data.splice(index - 1, 0, `gsy${index1}`);
+          // console.log(`gsy${index1}`);
+          this.supplier.id = `gsy${index1}`;
+        }
+      });
+    },
+
+    querySearchAsync(queryString, cb) {
+      clearTimeout(this.timeout);
+      var results = [];
+      if (queryString == "") {
+        cb(results);
+      } else {
+        // 获取供应商类别接口
+        getsupplytype()
+          .then((res) => {
+            if (res.status == 200) {
+              var result = res.data.data.list;
+              //远程搜索需要的数组
+              for (let i = 0; i < result.length; i++) {
+                const element = result[i];
+                results.push({
+                  value: element.name,
+                  name: element.value,
+                });
+              }
+              cb(results);
+            } else {
+              results = [];
+              cb(results);
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+          });
+      }
+    },
+
+    handleSelect(item) {
+      console.log(item, "l");
+      this.supplier.name = item.value;
+      this.supplier.value = item.name;
+    },
+
     //  验证表单内容
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
           alert("submit!");
           this.dialogVisible = false;
         } else {
-          console.log("error submit!!");
           return false;
         }
       });
     },
 
     // 首次打开新增页面判断是否有首要联系人
-    getcontacts() {
+    getcontacts(val) {
       let data = {
         value: 0,
         label: "是",
       };
+      getsupplyandcontactone({ id: val }).then((res) => {
+        console.log(res, "oo");
+        if (res.data.code == 0) {
+          this.recordInfo.tableList = res.data.data.contact;
+          if (this.recordInfo.tableList.length == 0) {
+            this.recordInfo.tableList = [{}];
+            this.recordInfo.tableList[0].is_first = data;
+            this.$forceUpdate();
+          } else {
+            this.recordInfo.tableList.forEach((o) => {
+              if (o.is_first == 0) {
+                o.is_first = "否";
+              } else if (o.is_first == 1) {
+                o.is_first = "是";
+              }
+            });
+          }
+
+          console.log(this.recordInfo.tableList, "this.recordInfo.tableList");
+        }
+      });
+
       if (this.recordInfo.tableList.length == 1) {
-        this.recordInfo.tableList[0].name = data;
+        this.recordInfo.tableList[0].is_first = data;
         this.$forceUpdate();
       }
     },
         value: 0,
         label: "是",
       };
+      let arr = [];
       if (this.recordInfo.tableList.length == 1) {
-        this.recordInfo.tableList[0].name = data2;
+        this.recordInfo.tableList[0] = data2;
         this.$forceUpdate();
       }
-
       this.recordInfo.tableList.forEach((el, index) => {
-        console.log(el, "oo");
         if (scope.$index == index) {
-          el.name = data2;
+          el.is_first = data;
+          // console.log(scope);
           this.$forceUpdate();
-          console.log(el.name.value, scope.$index, index);
         } else {
-          el.name = data1;
+          el.is_first = data1;
           this.$forceUpdate();
-          console.log("kkk");
         }
+        arr.push(el.is_first.value);
       });
-    },
-
-    // 供应商编码动态递增
-    orderIdAdd() {
-      // 模拟情景
-      let data = ["gsy001","gsy002", "gsy003", "gsy006"];
-      let len = 3;
-      data.forEach((o, index) => {
-        o = o.split("gsy");
-        index = index + 1;
-        let index1 = index;
-        index1 = parseInt(index1, 10);
-        index1 = index1.toString();
-        while (index1.length < len) index1 = "0" + index1;
-        if (o[1] != index1) {
-          data.splice(index - 1, 0, `gsy${index1}`);
-          console.log(`gsy${index1}`);
-          this.supplier.id = `gsy${index1}`
-        }
-        
-      });
+      if (arr.includes(0)) {
+        return;
+      } else {
+        this.recordInfo.tableList[0].is_first = data2;
+      }
     },
 
     // 添加表单行
         // }
       })
         .then((res) => {
-          console.log(res, "ooo");
+          // console.log(res, "ooo");
         })
         .catch((err) => {
-          console.log(err, "ddd");
+          // console.log(err, "ddd");
         });
     },
   },
     width: 75%;
   }
 }
+.el-dialog__body {
+  .el-form-item__content {
+    .el-autocomplete {
+      width: 75% !important;
+    }
+  }
+}
 
 .tablebtn {
   padding: 10px 12px;

src/xt_pages/supply/components/editGoodOrder.vue

     <div>
         <el-button size="small" type="primary" @click="updateGoodOrder">保存</el-button>
         <el-button size="small" type="primary"  @click="toClick" v-show="showThree">生成采购退货单</el-button>
-        <el-button size="small" type="primary"  v-show="showOne">审核</el-button>
-        <el-button size="small" type="primary"  v-show="showTwo">反审核</el-button>
+        <el-button size="small" type="primary"  v-show="showOne" @click="checkGoodOrder">审核</el-button>
+        <el-button size="small" type="primary"  v-show="showTwo" @click="MofyGoodOrder">反审核</el-button>
 
        
     </div>
     </el-table-column>
     <el-table-column label="生产厂家" align="center" width="200px">
         <template slot-scope="scope">
-         <el-select size="small" v-model="scope.row.supply_manufacturer" filterable placeholder="请选择厂家" :disabled="true">
+         <el-select size="small" v-model="scope.row.supply_manufacturer" filterable  :disabled="true">
                 <el-option
                   v-for="(option, index) in manufactuerList"
                   :key="index"
 
         <span>本次欠款:<el-input style="width:100px" v-model="arrearage"></el-input></span>
     </div>
+    <!-- <Computed></Computed> -->
 </div>
 
   <!-- <el-dialog
 </template>
 
 <script>
+import Computed from "../../components/Computed/index_1.vue"
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import {uParseTime } from '@/utils/tools'
-import {getInitOrder,checkPurchaseOrder,getGoodOrderDetail,updateGoodOrder,getGoodOrderCountList,ModefySupplyWarehousing} from "@/api/supply"
+import {getInitOrder,checkPurchaseOrder,getGoodOrderDetail,updateGoodOrder,getGoodOrderCountList,ModefySupplyWarehousing,MofyGoodOrder,UpdateSupplyWahouseingInfo} from "@/api/supply"
 export default {
 name: "addPurchaseOrder",
 components: {
-BreadCrumb
+BreadCrumb,
+Computed
 },
 data() {
 return {
   },
   toClick(){
     this.$router.push({path:"/good/return/add?id="+this.id})
+  },
+  //反审核
+  MofyGoodOrder(){
+     var id = this.$route.query.id
+     var warehousing_id = this.$route.query.warehousing_id
+     var params = {
+       id:id,
+       warehousing_id:warehousing_id,
+     }
+    MofyGoodOrder(params).then(response=>{
+      if(response.data.state == 1){
+        var msg = response.data.data.msg
+        if(msg == 1){
+          this.$message.success("反审核成功!")
+        }
+        if(msg == 2){
+          this.$message.error("该单有自动出库或生成了退货单,反审核失败!")
+          
+        }
+
+        var purcaseOrder = response.data.data.purcaseOrder
+        console.log("采购订单",purcaseOrder)
+        
+        var goodOrder = response.data.data.goodOrder
+        console.log("采购单",goodOrder)
+        var drugList = response.data.data.drugList
+        console.log("druglist23323223",drugList)
+        var ids =""
+        // 如果采购单没有数据，则代表改订单第一次生成采购订单数据
+        if(goodOrder.length == 0){
+          this.$router.push({path:"/good/order/add?id="+id+"&ids="+ids})
+        } 
+        for(let i=0;i<purcaseOrder.length;i++){
+          for(let j=0;j<drugList.length;j++){
+             if(purcaseOrder[i].is_source == 1){
+               if(purcaseOrder[i].supply_unit == drugList[j].max_unit){
+                  purcaseOrder[i].count = purcaseOrder[i].count * drugList[j].min_number
+               }
+             }
+          }
+        }
+
+        for(let i=0;i<goodOrder.length;i++){
+          for(let j=0;j<drugList.length;j++){
+            if(goodOrder[i].is_source == 1){
+              if(goodOrder[i].supply_unit == drugList[j].max_unit){
+                 goodOrder[i].count = goodOrder[i].count * drugList[j].min_number
+              }
+            }
+          }
+        }
+        
+        let objInfo = {}
+        if (goodOrder.length >0){
+          goodOrder.forEach((item,index)=>{
+            let { project_id } = item
+            if(!objInfo[project_id]){
+              objInfo[project_id] = {
+                project_id,
+                child:[],
+                count:0,
+              }
+            }
+          })
+          let newArr = Object.values(objInfo);
+        
+          for(let i=0;i<goodOrder.length;i++){
+            for(let j=0;j<newArr.length;j++){
+              if(goodOrder[i].project_id == newArr[j].project_id){
+                newArr[j].child.push(goodOrder[i])
+              }
+            }
+          }
+          console.log("newAr2332232323",newArr)
+        
+          for(let i=0;i<newArr.length;i++){
+           for(let j=0;j<newArr[i].child.length;j++){
+             newArr[i].count += newArr[i].child[j].count
+           }
+          }
+
+          var arr = []
+          var total = 0
+          var str = ""
+         
+          //如果采购单有数据，则需要比较数量
+          if(newArr.length > 0){
+            for(let i=0;i<purcaseOrder.length;i++){
+              for(let j=0;j<newArr.length;j++){
+                if(purcaseOrder[i].project_id == newArr[j].project_id){
+                    //根据商品ID比较数量大小,如果采购单的数量大于采购订单的数据
+                    if(purcaseOrder[i].count < newArr[j].count){
+                      arr.push(purcaseOrder[i].project_id)
+                    }
+
+                }
+              }
+            }
+            //如果total的长度等于0,怎修改该订单的状态为全部入库
+        
+            if(arr.length > 0){
+              //修改采购订单的状态为全部入库
+              this.UpdateSupplyWahouseingInfo()
+            }
+          }
+        }
+        
+      }
+    })
+  },
+  UpdateSupplyWahouseingInfo(){
+     var params = {
+       warehousing_id:this.$route.query.warehousing_id,
+     }
+    UpdateSupplyWahouseingInfo(params).then(response =>{
+       if(response.data.state == 1){
+         var msg = response.data.data.msg
+       }
+    })
   }
 },
 created(){

src/xt_pages/supply/components/editSupply.vue

+<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>单据编码:{{good_number}}</span>
+
+    </div>
+    <div>
+        <el-button size="small" type="primary" @click="updateGoodOrder">修改</el-button>
+        <el-button size="small" type="primary"  @click="checkGoodOrder">审核</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>
+            <div style="visibility: hidden">/</div>
+        </template>
+    </el-table-column>
+    <el-table-column label="规格&单位" align="center" width="120px">
+        <template slot-scope="scope">
+            <el-input v-model="scope.row.supply_specification_name" style="width:100px" :disabled="true"></el-input>
+            <div style="visibility: hidden">/</div>
+        </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="header" slot-scope="scope">
+            <span>批号<span style="color: red">*</span></span>
+        </template>
+        <template slot-scope="scope">
+           <el-form-item  :prop="'tableList.' + scope.$index + '.supply_batch_number'" :rules='tableRules.supply_batch_number'>
+             <el-input v-model="scope.row.supply_batch_number" style="width:80px" :disabled="disabled"></el-input>
+          </el-form-item>
+        </template>
+    </el-table-column>
+     <el-table-column label="有效日期" 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 + '.supply_expiry_date'"
+                :rules="tableRules.supply_expiry_date">
+                <el-date-picker prefix-icon="el-icon-date" style="width:180px" v-model="scope.row.supply_expiry_date"
+                                type="date" placeholder="选择日期时间" format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd">
+                </el-date-picker>
+             </el-form-item>
+       </template>
+    </el-table-column>
+    <el-table-column label="可用库存" align="center" width="100px">
+        <template slot-scope="scope">
+            <el-input v-model="scope.row.supply_total" style="width:80px" :disabled="true"></el-input>
+            <div style="visibility: hidden">/</div>
+        </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>
+        <div style="visibility: hidden">/</div>
+        </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="header" slot-scope="scope">
+            <span>生产日期<span style="color: red">*</span></span>
+        </template>
+        <template slot-scope="scope">
+          <el-form-item  :prop="'tableList.' + scope.$index + '.supply_product_date'"
+                :rules="tableRules.supply_product_date">
+                <el-date-picker prefix-icon="el-icon-date" style="width: 180px" v-model="scope.row.supply_product_date"
+                                type="date" placeholder="选择日期时间" format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd">
+                </el-date-picker>
+          </el-form-item>
+        </template>
+    </el-table-column>
+    <el-table-column label="生产厂家" align="center" width="200px">
+        <template slot-scope="scope">
+         <el-select size="small" v-model="scope.row.supply_manufacturer" filterable placeholder="请选择厂家" :disabled="true">
+                <el-option
+                  v-for="(option, index) in manufactuerList"
+                  :key="index"
+                  :label="option.manufacturer_name"
+                  :value="option.id">
+                </el-option>
+          </el-select>
+          <div style="visibility: hidden">/</div>
+        </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="true"></el-input>
+        <div style="visibility: hidden">/</div>
+        </template>
+    </el-table-column>
+
+     <el-table-column label="关联采购订单号" align="center" width="200px">
+        <template slot-scope="scope">
+        <el-input v-model="scope.row.order_number" style="width:160px" :disabled="true"></el-input>
+        <div style="visibility: hidden">/</div>
+        </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>
+        <div style="visibility: hidden">/</div>
+        </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="payment"></el-input></span>
+
+        <span>本次欠款:<el-input style="width:100px" v-model="arrearage"></el-input></span>
+    </div>
+    <!-- <Computed></Computed> -->
+</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 Computed from "../../components/Computed/index_1.vue"
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import {uParseTime } from '@/utils/tools'
+import {getInitOrder,checkPurchaseOrder,getGoodOrderDetail,updateGoodOrder,getGoodOrderCountList,ModefySupplyWarehousing} from "@/api/supply"
+export default {
+name: "addPurchaseOrder",
+components: {
+BreadCrumb,
+Computed
+},
+data() {
+return {
+    crumbs: [
+       { path: false, name: "采购管理" },
+       { path: "/supply/good/order/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:"",
+    end_time:"",
+    tableRules: {
+     name: [{ required: true, message: '商品不能为空', trigger: 'blur' }],
+     supply_count: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
+     supply_batch_number:[{required:true,message:"批号不能为空", trigger: 'blur'}],
+     supply_product_date:[{required:true,message:"生产日期不能为空", trigger: 'blur'}],
+     supply_expiry_date:[{required:true,message:"有效日期不能为空",trigger: 'blur'}]
+   },
+   warehousing_id:0,
+   number:"",
+   loading:false,
+   drugList:[],
+   goodList:[],
+   id:0,
+   disabled:false,
+   is_check:0,
+   dialogVisible:false,
+   arrearage:"",
+   payment:"",
+   good_number:"",
+   orderInfo:[],
+   showOne:true,
+   showTwo:false,
+   warese_out_id:0,
+  };
+},
+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++){
+             if(drugList[i].max_unit == drugList[i].drug_warehouse_info[z].max_unit){
+              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
+        if(drugList[i].max_unit != drugList[i].min_unit){
+          drugList[i].unitList = [{id:1,name:""},{id:2,name:""}]
+        }
+        if(drugList[i].max_unit == drugList[i].min_unit){
+          drugList[i].unitList = [{id:1,name:""}]
+        }
+       
+        drugList[i].warehouse_info_id = 0
+        drugList[i].warehousing_id= 0
+        drugList[i].supply_unit = drugList[i].max_unit 
+        for(let j=0;j<drugList[i].unitList.length;j++){
+          if(drugList[i].max_unit != drugList[i].min_unit){
+            drugList[i].unitList[0].name = drugList[i].max_unit
+            drugList[i].unitList[1].name = drugList[i].min_unit
+          }
+          if(drugList[i].max_unit  == drugList[i].min_unit){
+            drugList[i].unitList[0].name = drugList[i].max_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:""}]
+        goodList[i].supply_unit = goodList[i].packing_unit
+        goodList[i].warehouse_info_id = 0
+        goodList[i].warehousing_id= 0
+        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){
+  
+   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_count * val.supply_price).toFixed(2)
+        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
+        this.recordInfo.tableList[i].warehouse_info_id = val.warehouse_info_id
+        this.recordInfo.tableList[i].warehousing_id = val.warehousing_id
+     }
+    }
+   
+
+},
+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"] = ""
+    tempObj["supply_batch_number"] = ""
+    tempObj["supply_product_date"] = ""
+    tempObj["order_number"] = ""
+    tempObj["supply_expiry_date"] = ""
+    tempObj["manufacturer_id"] = ""
+    tempObj["warehouse_info_id"] = ""
+    tempObj["warehousing_id"]= ""
+    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+arr[i].stock_min_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}')
+},
+
+ 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(() => {
+    }) 
+  },
+  getGoodOrderDetail(){
+     
+      var id = this.$route.query.id
+    getGoodOrderDetail(id).then(response=>{
+      if(response.data.state == 1){
+        var out = response.data.data.out
+        this.is_check = out.is_check
+        this.id = out.id
+        this.supplier_name = out.supplier_id
+        this.rate_of_concession = out.rate_of_concession
+        this.discount_amount = out.discount_amount
+        this.payment = out.payment
+        this.arrearage = out.arrearage
+        this.number = out.number
+        this.good_number = out.good_number
+        this.start_time = this.getTimes(out.document_date)
+        var orderInfo = response.data.data.list
+        
+        var drugList = response.data.data.drugList
+        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
+             orderInfo[i].order_number =  orderInfo[i].order_number
+             orderInfo[i].supply_total_price = (orderInfo[i].count * orderInfo[i].price).toFixed(2)
+             orderInfo[i].supply_expiry_date = this.getTimes(orderInfo[i].supply_expiry_date)
+             orderInfo[i].supply_product_date = this.getTimes(orderInfo[i].supply_product_date)
+           if(orderInfo[i].is_source == 1){
+            for(let j=0;j<drugList.length;j++){
+                if( orderInfo[i].project_id == drugList[j].id){
+                  if(drugList[j].max_unit!=drugList[j].min_unit){
+                    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(drugList[j].max_unit ==drugList[j].min_unit){
+                    orderInfo[i].unitList = [{id:1,name:""}]
+                    orderInfo[i].unitList[0].name = drugList[j].max_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
+                }
+            }  
+          } 
+        }
+      
+        this.recordInfo.tableList= []
+        this.recordInfo.tableList = orderInfo
+       
+          console.log("orderINFO23323232",this.recordInfo.tableList)
+      }
+    })  
+  },
+  toPrint(){
+     var id = this.$route.query.id
+     this.$router.push({path:"/purchase/order/print?&id="+id})  
+  },
+  updateGoodOrder(){ 
+   
+    if(this.supplier_name == 0 || this.supplier_name == ""){
+       this.$message.error("供应商不能为空!")
+       this.loading = false
+       return false
+    } 
+    console.log("表哥2323233232",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_price = this.recordInfo.tableList[i].supply_price.toString()
+        this.recordInfo.tableList[i].supply_total_price= this.recordInfo.tableList[i].supply_total_price.toString()
+        this.recordInfo.tableList[i].supply_total = this.recordInfo.tableList[i].supply_total.toString()
+        if(this.recordInfo.tableList[i].id > 0){
+          this.recordInfo.tableList[i].type = 1
+        }
+        if(this.recordInfo.tableList[i].id == 0){
+          this.recordInfo.tableList[i].type = 2
+        }
+        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
+            }
+            if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].id){
+              this.recordInfo.tableList[i].supply_manufacturer = this.manufactuerList[j].manufacturer_name
+            }
+
+        }
+    }
+    var start = this.start_time
+    this.$refs["tableForm"].validate((valid)=>{
+        if(valid){
+           this.loading = true
+           var warehose_out_id = this.$route.query.id
+           var params = {
+             "stockIn":this.recordInfo.tableList,
+           } 
+           console.log("sotckind23232232323232323232",params)
+           
+           updateGoodOrder(params,this.supplier_name,start,this.arrearage,this.payment,warehose_out_id,this.number,this.rate_of_concession,this.discount_amount,this.good_number).then(response=>{
+           if(response.data.state == 1){
+             this.loading = false
+             this.$message.success("修改成功!")
+             
+           }
+         })
+        }
+    })
+  },
+  checkGoodOrder(){
+    var id = this.$route.query.id
+    var warehousing_id = this.$route.query.warehousing_id
+    getGoodOrderCountList(id,warehousing_id).then(response=>{
+      if(response.data.state == 1){
+        this.$message.success("审核成功!")
+        var purcaseOrder = response.data.data.purcaseOrder
+        console.log("采购订单",purcaseOrder)
+        
+        var goodOrder = response.data.data.goodOrder
+        console.log("采购单",goodOrder)
+        var drugList = response.data.data.drugList
+        console.log("druglist23323223",drugList)
+        var is_warehouse = 0
+        for(let i=0;i<purcaseOrder.length;i++){
+          for(let j=0;j<drugList.length;j++){
+             if(purcaseOrder[i].is_source == 1){
+               if(purcaseOrder[i].supply_unit == drugList[j].max_unit){
+                  purcaseOrder[i].count = purcaseOrder[i].count * drugList[j].min_number
+               }
+             }
+          }
+        }
+
+        for(let i=0;i<goodOrder.length;i++){
+          for(let j=0;j<drugList.length;j++){
+            if(goodOrder[i].is_source == 1){
+              if(goodOrder[i].supply_unit == drugList[j].max_unit){
+                 goodOrder[i].count = goodOrder[i].count * drugList[j].min_number
+              }
+            }
+          }
+        }
+        
+        let objInfo = {}
+        if (goodOrder.length >0){
+          goodOrder.forEach((item,index)=>{
+            let { project_id } = item
+            if(!objInfo[project_id]){
+              objInfo[project_id] = {
+                project_id,
+                child:[],
+                count:0,
+              }
+            }
+          })
+          let newArr = Object.values(objInfo);
+        
+          for(let i=0;i<goodOrder.length;i++){
+            for(let j=0;j<newArr.length;j++){
+              if(goodOrder[i].project_id == newArr[j].project_id){
+                newArr[j].child.push(goodOrder[i])
+              }
+            }
+          }
+          console.log("newAr2332232323",newArr)
+        
+          for(let i=0;i<newArr.length;i++){
+           for(let j=0;j<newArr[i].child.length;j++){
+             newArr[i].count += newArr[i].child[j].count
+           }
+          }
+
+          var arr = []
+          var total = 0
+          var str = ""
+         
+          //如果采购单有数据，则需要比较数量
+          if(newArr.length > 0){
+            for(let i=0;i<purcaseOrder.length;i++){
+              for(let j=0;j<newArr.length;j++){
+                if(purcaseOrder[i].project_id == newArr[j].project_id){
+                    //根据商品ID比较数量大小,把数量不足的商品ID储存,表示采购单的数量未满足采购订单的数据,部分入库
+                    if(purcaseOrder[i].count > newArr[j].count){
+                      arr.push(purcaseOrder[i].project_id)
+                    }
+                }
+              } 
+            }
+            //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成,全部入库
+          
+            if(arr.length == 0){
+              is_warehouse = 1
+              this.ModefySupplyWarehousing(is_warehouse,warehousing_id)
+            }
+            
+            //部分入库
+            if(total!=goodOrder.length){
+               //修改订购单
+               is_warehouse = 3
+               this.ModefySupplyWarehousing(is_warehouse,warehousing_id)
+            }
+          }
+        }
+      }
+    })
+  },
+  ModefySupplyWarehousing(is_warehouse,warehousing_id){
+     var params = {
+       is_warehouse:is_warehouse,
+       warehousing_id:warehousing_id,
+     }
+    ModefySupplyWarehousing(params).then(response=>{
+      if(response.data.state == 1){
+        var msg = response.data.data.msg
+      }
+    })
+  }
+},
+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"] = ""
+    tempObj["supply_batch_number"] = ""
+    tempObj["supply_product_date"] = ""
+    tempObj["order_number"] = ""
+    tempObj["supply_expiry_date"] = ""
+    tempObj["manufacturer_id"] = ""
+    tempObj["warehouse_info_id"] = ""
+    tempObj["warehousing_id"]= ""
+    this.recordInfo.tableList.push(tempObj)
+    this.getInitOrder()
+    if(parseInt(this.$route.query.id) > 0){
+      this.getGoodOrderDetail()
+    }
+    this.start_time = this.getTimes(new Date())
+    this.end_time = this.getTimes(new Date())
+}
+};
+</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/goodOrderQuery.vue

                 icon="el-icon-delete"
                 size="small"
                 type="danger"
-                @click="toClickOne(scope.row)"
+                @click="toDelete(scope.row)"
               >删除
               </el-button>
           </template>
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 
-import {getAllSupply,getAllGoodOrderList} from "@/api/supply"
+import {getAllSupply,getAllGoodOrderList,deleteGoodOrder} from "@/api/supply"
 import {uParseTime } from '@/utils/tools'
 export default {
   name: "stockIn",
       
      },
      toClick(val){
+       
        this.$router.push({path:"/good/order/edit?id="+val.id+"&warehousing_id="+val.warehousing_id})
-     }
+     },
+     toDelete(val,index){
+       console.log("val323223233223",val)
+       if(val.is_check == 1){
+         this.$message.error("已审核单据，不能删除!")
+         return false
+       }
+       if(val.cancelOut.length >0 ){
+         this.$message.error("已关联单据，不能删除!")
+         return false
+       }
+       this.$confirm('确认删除吗?', '删除', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
+        }).then(() => {
+          deleteGoodOrder(val.id).then(response => {
+            if (response.data.state == 1) {
+                var msg = response.data.data.msg
+                this.tableList.splice(index, 1);
+                this.$message.success("删除成功")
+            } else {
+                this.$message.error("删除失败")
+            }
+          })
+        })
+        .catch(() => {
+        }) 
+      }
   },
   created() {
     var now = new Date(); //当前日期 

src/xt_pages/supply/supplyQuery.vue

     <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 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-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">
+              :value="item.id"
+            >
             </el-option>
           </el-select>
           <el-date-picker
             v-model="start_time"
             prefix-icon="el-icon-date"
             :editable="false"
-            style="width: 196px;"
+            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
+          >-
+          <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>
           <el-input
             size="small"
-            style="width: 200px;margin-left:10px;"
+            style="width: 200px; margin-left: 10px"
             class="filter-item"
             v-model.trim="keywords"
             placeholder="耗材名称"
           >
         </div>
         <div>
-          <el-button size="small" type="primary" @click="toAdd">新增</el-button>
+          <el-button size="small" type="primary" @click="toAdd(1)"
+            >新增</el-button
+          >
           <addSupply ref="addSupply"></addSupply>
         </div>
       </div>
 
-
-       <el-table
+      <el-table
         :row-style="{ color: '#303133' }"
         :header-cell-style="{
           backgroundColor: 'rgb(245, 247, 250)',
-          color: '#606266'
+          color: '#606266',
         }"
         :data="tableList"
         :class="signAndWeighBoxPatients"
         border
       >
-        <el-table-column label="供应商类别" align="center">
+        <el-table-column prop="SupplierType" label="供应商类别" align="center">
           <template slot-scope="scope">
-            <span></span>
-         </template>
+            <span>{{ scope.row.SupplierType }}</span>
+          </template>
         </el-table-column>
-        <el-table-column label="供应商编码" align="center">
+        <el-table-column prop="SupplierCode" label="供应商编码" align="center">
           <template slot-scope="scope">
-
+            {{ scope.row.SupplierCode }}
           </template>
         </el-table-column>
-        <el-table-column label="供应商名称" align="center">
-            <template slot-scope="scope">
-              <span></span>
-            </template>
-         </el-table-column>
-        <el-table-column label="首要联系人" align="center">
+        <el-table-column prop="SupplierName" label="供应商名称" align="center">
           <template slot-scope="scope">
-
+            <span>{{ scope.row.SupplierName }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="增值税税率(%)" align="center">
+        <el-table-column prop="ConName" label="首要联系人" align="center">
           <template slot-scope="scope">
-
+            {{ scope.row.ConName }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="VatRate" label="增值税税率(%)" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.VatRate }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="BankAccount" label="银行账号" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.BankAccount }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="Bank" label="开户银行" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.Bank }}
           </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">
-
-          </span>
-
-         </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">
+        <el-table-column prop="Number" label="纳税人识别号" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.Number }}
+          </template>
+        </el-table-column>
 
-         </template>
-       </el-table-column>
+        <el-table-column prop="Phone" label="手机" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.Phone }}
+          </template>
+        </el-table-column>
 
-       <el-table-column label="操作" align="center" width="260px">
+        <el-table-column label="操作" align="center" width="200px">
           <template slot-scope="scope">
-              <el-button
-                size="small"
-                type="primary"
-                @click="toClick(scope.row)"
-              >库存流水
-              </el-button>
-              <el-button
-                size="small"
-                type="primary"
-                @click="toClickOne(scope.row)"
-              >批次
-              </el-button>
+            <el-button
+              icon="el-icon-edit-outline"
+              size="small"
+              type="primary"
+              @click="toClick(scope.row, 2)"
+              >编辑
+            </el-button>
+            <el-button
+              icon="el-icon-delete"
+              size="small"
+              type="danger"
+              @click="toDelete(scope.row, scope.$index)"
+              >删除
+            </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-sizes="[10, 50, 100, 200, 500, 1000]"
         :page-size="10"
         background
         align="right"
-        style="margin-top:20px;"
+        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 addSupply from "./components/addSupply.vue"
-// import {getSupplierId} from "@/api/supply"
+import addSupply from "./components/addSupply.vue";
+import {
+  getexporthistory,
+  delsupplys
+} from "@/api/supply";
 export default {
   name: "stockIn",
   created() {
     // this.initSupplierData()
-    this.org_id =  this.$store.getters.xt_user.org_id
+    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')
+    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 (start_time != null) {
+      this.start_time = start_time;
     }
-    if(end_time!=null){
-      this.end_time = end_time
+    if (end_time != null) {
+      this.end_time = end_time;
     }
-    window.sessionStorage.removeItem('start_time')
-    window.sessionStorage.removeItem('end_time')
+    window.sessionStorage.removeItem("start_time");
+    window.sessionStorage.removeItem("end_time");
+    this.initData();
   },
   components: {
     BreadCrumb,
-    addSupply
+    addSupply,
   },
   data() {
     return {
-      type_name:"",
+      page: 1,
+      limit: 10,
+
+      type_name: "",
       crumbs: [
         { path: false, name: "采购管理" },
-        { path: "/supply/good/order/query", name: "供应商管理" }
+        { path: "/supply/good/order/query", name: "供应商管理" },
       ],
       keywords: "",
       total: 0,
       limit: 10,
       goodType: [],
       goodInfo: [],
-      org_id:0,
-      types:[],
-      tableList:[1],
-      tyep_name:"",
+      org_id: 0,
+      types: [],
+      tableList: [],
+      tyep_name: "",
     };
   },
-  methods:{
-    // 获取供应商编码接口
-    // initSupplierData(){
-    //   getSupplierId().then(res => {
-    //     console.log(res,'sss')
-    //   })
-    // },
+  methods: {
+    initData() {
+      let params = {
+        limit: this.limit,
+        page: this.page,
+      };
+      getexporthistory(params).then((res) => {
+        if (res.data.state == 1) {
+          this.tableList = res.data.data.list;
+          this.total = res.data.data.total;
+        }
+      });
+    },
 
-     toAdd(){
-      //  console.log("res32323232323223",this.$refs.addSupply)
-       this.$refs.addSupply.show()
-     },
-      changeTypeName(){
+    toDelete(val, index) {
+      delsupplys(val.ID)
+        .then((res) => {
+          if (res.data.code == 0) {
+            this.$message.success(res.data.data.list);
+          }
+        })
+        .then(() => {
+          this.initData();
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
 
-     },
-     startTimeChange(){
+   
 
-     },
-     endTimeChange(){
-
-     },
-     search(){
-
-     },
-     handleSizeChange(){
-
-     },
-     handleCurrentChange(){
-
-     }
-  }
+    toAdd(val) {
+      this.$refs.addSupply.show(1, val);
+    },
+    toClick(data, val) {
+      this.$refs.addSupply.show(data, val);
+    },
+    changeTypeName() {},
+    startTimeChange() {},
+    endTimeChange() {},
+    search() {},
+    handleSizeChange(val) {
+      this.limit = val;
+      this.initData();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.initData();
+    },
+  },
 };
 </script>