11月14日 库存扣减更新

config/index.js

@@ -29,8 +29,8 @@ module.exports = {
 
     // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
-  //  host: 'xt.test.sgjyun.com',
-    host: 'localhost',
+   host: 'xt.test.sgjyun.com',
+   // host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/api/supply.js

@@ -143,3 +143,35 @@ export function ModefySupplyWarehousing(params) {
     params: params
   })
 }
+
+export function saveGoodReturnOrder(data, warehouse_out_id, start_time, rate_of_concession, discount_amount, arrearage, payment, supplier_id) {
+  return request({
+    url: '/api/supply/savegoodreturnOrder?warehouse_out_id=' + warehouse_out_id + '&start_time=' + start_time + '&rate_of_concession=' + rate_of_concession + '&discount_amount=' + discount_amount + '&arrearage=' + arrearage + '&payment=' + payment + '&supplier_id=' + supplier_id,
+    method: 'post',
+    data: data
+  })
+}
+
+export function getAllGoodReturnOrderList(params) {
+  return request({
+    url: '/api/supply/getallgoodreturnorderlist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getGoodReturnDetail(id, params) {
+  return request({
+    url: '/api/supply/getgoodreturndetail?id=' + id,
+    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
+  })
+}

src/router/modules/supply.js

@@ -100,6 +100,15 @@ export default {
       hidden: true,
       is_menu: false,
       isChild: true
+    },
+    {
+      path: '/good/return/edit',
+      component: () => import('@/xt_pages/supply/components/editGoodReturn'),
+      name: 'editGoodReturn',
+      meta: { title: 'editGoodReturn', noCache: true },
+      hidden: true,
+      is_menu: false,
+      isChild: true
     }
 
   ]

src/views/layout/Layout.vue

@@ -16,10 +16,10 @@
           <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/supply/components/addGoodOrder.vue

@@ -597,7 +597,7 @@ getTimes(time) {
         this.discount_amount = info.discount_amount
         this.number = info.number
         var orderInfo = response.data.data.orderInfo
-       
+        
         for(let i=0;i<orderInfo.length;i++){
           orderInfo[i].supply_batch_number = ""
           orderInfo[i].supply_product_date = ""
@@ -665,12 +665,7 @@ getTimes(time) {
         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
@@ -681,14 +676,16 @@ getTimes(time) {
 
         }
     }
-    var start = this.getTimes(this.start_time)
+    var start = this.start_time
     this.$refs["tableForm"].validate((valid)=>{
         if(valid){
            this.loading = true
            var warehousing_id = this.$route.query.id
            var params = {
              "stockIn":this.recordInfo.tableList,
-           } 
+           }
+        console.log("stockIN2323322332322323",params)  
+       
         addGoodOrder(params,this.supplier_name,start,this.arrearage,this.payment,warehousing_id,this.number,this.rate_of_concession,this.discount_amount).then(response=>{
           if(response.data.state == 1){
              this.loading = false
@@ -761,12 +758,7 @@ getTimes(time) {
         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

src/xt_pages/supply/components/addGoodReturn.vue

@@ -59,7 +59,8 @@
           <span>单据编码:{{ number }}</span>
         </div>
         <div>
-          <el-button size="small" type="primary" @click="toAdd">保存</el-button>
+          <el-button size="small" type="primary" @click="saveGoodReturn" v-show="showOne">保存</el-button>
+          <el-button size="small" type="primary" @click="saveGoodReturn" v-show="showTwo">修改</el-button>
           <el-button size="small" type="primary" @click="updatePurchaseOrder"
             >审核</el-button
           >
@@ -73,8 +74,8 @@
         <el-table
           :row-style="{ color: '#303133' }"
           :header-cell-style="{
-            backgroundColor: 'rgb(245, 247, 250)',
-            color: '#606266',
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
           }"
           :data="recordInfo.tableList"
           :class="signAndWeighBoxPatients"
@@ -133,23 +134,23 @@
             </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="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
@@ -226,9 +227,9 @@
           <el-table-column label="关联采购订单号" align="center" width="200px">
             <template slot-scope="scope">
               <el-input
-                v-model="scope.row.supply_license_number"
+                v-model="scope.row.order_number"
                 style="width: 160px"
-                :disabled="disabled"
+                :disabled="true"
               ></el-input>
             </template>
           </el-table-column>
@@ -236,9 +237,9 @@
           <el-table-column label="源购货订单号" align="center" width="200px">
             <template slot-scope="scope">
               <el-input
-                v-model="scope.row.supply_license_number"
+                v-model="scope.row.good_number"
                 style="width: 160px"
-                :disabled="disabled"
+                :disabled="true"
               ></el-input>
             </template>
           </el-table-column>
@@ -253,52 +254,34 @@
             </template>
           </el-table-column>
 
-          <el-table-column
-            label="操作"
-            align="center"
-            width="150px"
-            fixed="right"
-          >
+          <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 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-column>
         </el-table>
       </el-form>
       <div style="margin-top: 10px">
-        <!-- 合计:{{getAllPrice()}} 元 -->
         <el-input
           type="textarea"
           :rows="2"
-          placeholder="无备注信息"
-          v-model="tipsInfo"
+          placeholder="备注信息"
+          v-model="return_remark"
         >
         </el-input>
       </div>
@@ -321,30 +304,19 @@
         <span
           >本次付款:<el-input
             style="width: 100px"
-            v-model="discount_amount"
+            v-model="payment"
           ></el-input
         ></span>
 
         <span
           >本次欠款:<el-input
             style="width: 100px"
-            v-model="discount_amount"
+            v-model="arrearage"
           ></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>
 
@@ -353,9 +325,8 @@ import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import { uParseTime } from "@/utils/tools";
 import {
   getInitOrder,
-  updatePurchaseOrder,
-  checkPurchaseOrder,
-  getPurchaseOrderDetail,
+  getGoodOrderDetail,
+  saveGoodReturnOrder
 } from "@/api/supply";
 export default {
   name: "addPurchaseOrder",
@@ -369,8 +340,8 @@ export default {
         { path: false, name: "购货单" },
         { path: "/good/return/add", name: "新增退货单" },
       ],
-      showTwo: true,
-      showOne: false,
+      showTwo: false,
+      showOne: true,
       recordInfo: {
         tableList: [1],
       },
@@ -398,9 +369,9 @@ export default {
       supplier_name: "",
       supplyList: [],
       rate_of_concession: "",
+      arrearage:"",
+      payment:"",
       discount_amount: "",
-      start_time: new Date(),
-      end_time: new Date(),
       tableRules: {
         name: [{ required: true, message: "商品不能为空", trigger: "blur" }],
         supply_count: [
@@ -416,6 +387,7 @@ export default {
       disabled: false,
       is_check: 0,
       dialogVisible: false,
+      return_remark:"",
     };
   },
   methods: {
@@ -542,7 +514,6 @@ export default {
       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;
@@ -745,73 +716,159 @@ export default {
         })
         .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;
+    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.start_time = this.getTimes(out.document_date)
+          var orderInfo = response.data.data.list
+          console.log("orderINFO233232232332",orderInfo)
+          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].good_number = orderInfo[i].good_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
+                  }
+              }  
+            } 
           }
-          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;
+        
+          this.recordInfo.tableList= []
+          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 });
-    },
+    saveGoodReturn(){
+      var warehouse_out_id = this.$route.query.id;
+      this.$refs["tableForm"].validate((valid)=>{
+        if(valid){
+          this.loading = true
+          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 = this.recordInfo.tableList[i].supply_total.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
+                }
+                if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].id){
+                  this.recordInfo.tableList[i].supply_manufacturer = this.manufactuerList[j].manufacturer_name
+                }
+
+            }
+          }
+          var params = {
+            "stockIn":this.recordInfo.tableList,
+            "return_marke":this.return_remark,
+          }
+          console.log("start_time232233232",this.start_time)
+          
+          saveGoodReturnOrder(params,warehouse_out_id,this.start_time,this.rate_of_concession,this.discount_amount,this.arrearage,this.payment,this.supplier_name).then(response=>{
+            if(response.data.state == 1){
+               this.loading = false
+               this.showOne = false
+               this.showTwo = true
+               this.$message.success("保存成功!")
+               var warehouseCancel = response.data.data.warehouseCancel
+               var out = response.data.data.cancelOrder
+               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.start_time = this.getTimes(out.document_date)
+               var orderInfo = response.data.data.list
+               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].good_number = orderInfo[i].good_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<this.drugList.length;j++){
+                      if( orderInfo[i].project_id == this.drugList[j].id){
+                        if(this.drugList[j].max_unit!=this.drugList[j].min_unit){
+                          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(this.drugList[j].max_unit ==this.drugList[j].min_unit){
+                          orderInfo[i].unitList = [{id:1,name:""}]
+                          orderInfo[i].unitList[0].name = this.drugList[j].max_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
+                      }
+                  }  
+                } 
+              }
+              this.recordInfo.tableList= []
+              this.recordInfo.tableList = orderInfo
+            }
+          })
+        }
+      })
+    }
   },
   created() {
     const tempObj = {};
@@ -833,7 +890,8 @@ export default {
     tempObj["supply_unit"] = "";
     this.recordInfo.tableList.push(tempObj);
     this.getInitOrder();
-    this.getPurchaseOrderDetail();
+    //获取购货单列表
+    this.getGoodOrderDetail();
   },
 };
 </script>

src/xt_pages/supply/components/editGoodOrder.vue

@@ -7,8 +7,7 @@
     <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-select v-model="supplier_name" style="width:140px;margin-right:10px;" placeholder="请选择">
         <el-option
             v-for="item in supplyList"
             :key="item.id"
@@ -49,7 +48,9 @@
     </div>
     <div>
         <el-button size="small" type="primary" @click="updateGoodOrder">修改</el-button>
-        <el-button size="small" type="primary"  @click="checkGoodOrder">审核</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>
 
        
     </div>
@@ -278,8 +279,9 @@ return {
        { path: false, name: "采购单" },
        { path: "/supply/good/order/query", name: "编辑采购单" }
     ],
-    showTwo:true,
-    showOne:false,
+    showOne:true,
+    showTwo:false,
+    showThree:false,
     recordInfo: {
       tableList:[],
     },
@@ -330,9 +332,8 @@ return {
    payment:"",
    good_number:"",
    orderInfo:[],
-   showOne:true,
-   showTwo:false,
    warese_out_id:0,
+   
   };
 },
 methods:{
@@ -493,6 +494,8 @@ handleEdit(){
     tempObj["manufacturer_id"] = ""
     tempObj["warehouse_info_id"] = ""
     tempObj["warehousing_id"]= ""
+    tempObj["number"] = ""
+    tempObj["good_number"] = ""
     this.recordInfo.tableList.push(tempObj)
 },
 handleDelete: function(index, row) {
@@ -504,19 +507,6 @@ handleDelete: function(index, row) {
    }
 },
 
-changeTypeName(){
-
-},
-startTimeChange(){
-
-},
-endTimeChange(){
-
-},
-search(){
-
-},
-
 getWarehoseInfo(arr,max_unit,min_unit,min_number){
     var total = 0
     var max_str=  ""
@@ -598,6 +588,12 @@ getTimes(time) {
       if(response.data.state == 1){
         var out = response.data.data.out
         this.is_check = out.is_check
+        if(out.is_check == 1){
+          this.showOne = false
+          this.showTwo = true
+          this.showThree = true
+        }
+
         this.id = out.id
         this.supplier_name = out.supplier_id
         this.rate_of_concession = out.rate_of_concession
@@ -651,8 +647,7 @@ getTimes(time) {
       
         this.recordInfo.tableList= []
         this.recordInfo.tableList = orderInfo
-       
-          console.log("orderINFO23323232",this.recordInfo.tableList)
+      
       }
     })  
   },
@@ -667,19 +662,13 @@ getTimes(time) {
        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
@@ -698,8 +687,6 @@ getTimes(time) {
            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
@@ -716,6 +703,9 @@ getTimes(time) {
     getGoodOrderCountList(id,warehousing_id).then(response=>{
       if(response.data.state == 1){
         this.$message.success("审核成功!")
+        this.showOne = false
+        this.showTwo = true
+        this.showThree = true
         var purcaseOrder = response.data.data.purcaseOrder
         console.log("采购订单",purcaseOrder)
         
@@ -817,6 +807,9 @@ getTimes(time) {
         var msg = response.data.data.msg
       }
     })
+  },
+  toClick(){
+    this.$router.push({path:"/good/return/add?id="+this.id})
   }
 },
 created(){
@@ -844,6 +837,8 @@ created(){
     tempObj["manufacturer_id"] = ""
     tempObj["warehouse_info_id"] = ""
     tempObj["warehousing_id"]= ""
+    tempObj["number"] = ""
+    tempObj["good_number"] = ""
     this.recordInfo.tableList.push(tempObj)
     this.getInitOrder()
     if(parseInt(this.$route.query.id) > 0){

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -535,6 +535,9 @@ getTimes(time) {
               if(this.recordInfo.tableList[i].supply_manufacturer == this.manufactuerList[j].id){
                  this.recordInfo.tableList[i].supply_manufacturer = this.manufactuerList[j].manufacturer_name
               }
+              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.start_time

src/xt_pages/supply/goodOrderQuery.vue

@@ -102,12 +102,12 @@
         </el-table-column>
         <el-table-column label="优惠后金额" align="center">
          <template slot-scope="scope">
-           {{getAllCount(scope.row.orderOut)}}
+           {{getAllMoney(scope.row.discount_amount,scope.row.orderOut)}}
          </template>
        </el-table-column>
         <el-table-column label="已付款" align="center">
          <template slot-scope="scope">
-           {{getAllCount(scope.row.orderInfo)}}
+           {{scope.row.payment}}
          </template>
        </el-table-column>
        <el-table-column label="数量" align="center">
@@ -221,16 +221,16 @@ export default {
        this.$router.push({path:"/good/order/add?id="+id})
      },
      changeTypeName(){
-
+       this.getlist()
      },
      startTimeChange(){
-
+      this.getlist()
      },
      endTimeChange(){
-
+      this.getlist()
      },
      search(){
-
+       this.getlist()
      },
      handleSizeChange(val){
        this.limit = val
@@ -251,9 +251,7 @@ export default {
          }
        })
      },
-     changeTypeName(){
 
-     },
      getTimes(time) {
       if (time === '') {
       return ''
@@ -263,12 +261,13 @@ export default {
      getlist(){
         var params = {
           check_id:this.check_id,
-          start_time:this.getTimes(this.start_time),
-          end_time:this.getTimes(this.end_time),
+          start_time:this.start_time,
+          end_time:this.end_time,
           keyword:this.keywords,
           page:this.page,
           limit:this.limit,
         }
+       console.log("param2323322332",params)
        getAllGoodOrderList(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list 
@@ -307,16 +306,37 @@ export default {
        return buy_price.toFixed(2)
      },
      getAllCount(arr){
-       var count = ""
+       var count = 0
         if(arr!=undefined && arr.length > 0){
           for(let i=0;i<arr.length;i++){
-            count += arr[i].count
+            count += parseInt(arr[i].count)
           }
        }
-       return count
+       if(count == 0){
+         return ""
+       }
+       if(count >0){
+        return count
+       }
+     
+     },
+     getAllMoney(paycount,arr){
+       var all_price= 0
+       if(arr!=undefined && arr.length > 0){
+         for(let i=0;i<arr.length;i++){
+          all_price += arr[i].count * arr[i].price
+         }
+       }
+       if(all_price == 0){
+         return ""
+       }
+       if(all_price >0){
+
+         return (all_price - all_price * (paycount/100)).toFixed(2)
+       }
+      
      },
      toClick(val){
-       console.log("val3232232323",val)
        this.$router.push({path:"/good/order/edit?id="+val.id+"&warehousing_id="+val.warehousing_id})
      }
   },

src/xt_pages/supply/goodreturn.vue

@@ -66,62 +66,65 @@
 
 
        <el-table
-        :row-style="{ color: '#303133' }"
-        :header-cell-style="{
-          backgroundColor: 'rgb(245, 247, 250)',
-          color: '#606266'
-        }"
-        :data="tableList"
-        :class="signAndWeighBoxPatients"
-        border
+          :row-style="{ color: '#303133' }"
+          :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+          }"
+          :data="tableList"
+          :class="signAndWeighBoxPatients"
+          border
+          style="width: 100%"
+          max-height="450"
+         
       >
-        <el-table-column label="单据日期" align="center">
+        <el-table-column label="单据日期" align="center" width="200">
           <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" width="200">
           <template slot-scope="scope">
             <span>{{scope.row.number}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="供应商" align="center">
+        <el-table-column label="供应商" align="center" width="200">
             <template slot-scope="scope">
               <span>{{getName(scope.row.supplier_id)}}</span>
             </template>
          </el-table-column>
         <el-table-column label="关联购货订单号" align="center" width="200">
           <template slot-scope="scope">
-            
+            <span v-if="scope.row.cancelOrder.length >0">{{scope.row.cancelOrder[0].order_number}}</span>
           </template>
         </el-table-column>
            <el-table-column label="源采购单号" align="center" width="200">
           <template slot-scope="scope">
-            
+             <span v-if="scope.row.cancelOrder.length >0">{{scope.row.cancelOrder[0].good_number}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="购货金额" align="center">
+        <el-table-column label="购货金额" align="center" width="200">
           <template slot-scope="scope">
-             <span v-if="getAllBuyPrice(scope.row.orderInfo)>0">{{getAllBuyPrice(scope.row.orderInfo)}}</span> 
+             <!-- <span v-if="getAllBuyPrice(scope.row.orderInfo)>0">{{getAllBuyPrice(scope.row.orderInfo)}}</span>  -->
           </template>
         </el-table-column>
-        <el-table-column label="优惠后金额" align="center">
+        <el-table-column label="优惠后金额" align="center" width="200">
          <template slot-scope="scope">
-           {{getAllCount(scope.row.orderInfo)}}
+           <!-- {{getAllCount(scope.row.orderInfo)}} -->
          </template>
        </el-table-column>
-        <el-table-column label="已退款" align="center">
+        <el-table-column label="已退款" align="center" width="200">
          <template slot-scope="scope">
-           {{getAllCount(scope.row.orderInfo)}}
+           <!-- {{getAllCount(scope.row.orderInfo)}} -->
          </template>
        </el-table-column>
-       <el-table-column label="源数量" align="center">
+       <el-table-column label="源数量" align="center" width="200">
          <template slot-scope="scope">
-           {{getAllCount(scope.row.orderInfo)}}
+           <!-- {{getAllCount(scope.row.orderInfo)}} -->
          </template>
        </el-table-column>
 
-       <el-table-column label="退款状态" align="center">
+       <el-table-column label="退款状态" align="center" width="200">
          <template slot-scope="scope">
            <span v-if="scope.row.is_check == 2">未审核</span>
            <span v-if="scope.row.is_check == 1">已审核</span>
@@ -129,25 +132,25 @@
        </el-table-column>
       
           
-      <el-table-column label="制单人" align="center">
+      <el-table-column label="制单人" align="center" width="200">
          <template slot-scope="scope">
           {{getDocName(scope.row.creater)}}
          </template>
        </el-table-column>
 
-      <el-table-column label="审核人" align="center">
+      <el-table-column label="审核人" align="center" width="200">
          <template slot-scope="scope">
           {{getDocName(scope.row.checker)}}
          </template>
        </el-table-column>
 
-       <el-table-column label="操作" align="center" width="260px">
+       <el-table-column label="操作" align="center" width="260"  fixed="right">
           <template slot-scope="scope">
               <el-button
                 icon="el-icon-edit-outline"
                 size="small"
                 type="primary"
-                @click="toClick(scope.row.id)"
+                @click="editGoodReturn(scope.row.id)"
               >编辑
               </el-button>
               <el-button
@@ -180,7 +183,7 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 
-import {getAllSupply,getAllPurchaseOrderList} from "@/api/supply"
+import {getAllSupply,getAllGoodReturnOrderList} from "@/api/supply"
 import {uParseTime } from '@/utils/tools'
 export default {
   name: "stockIn",
@@ -273,7 +276,7 @@ export default {
           page:this.page,
           limit:this.limit,
         }
-       getAllPurchaseOrderList(params).then(response=>{
+       getAllGoodReturnOrderList(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list 
             console.log("list2332232323232",list)
@@ -319,8 +322,8 @@ export default {
        }
        return count
      },
-     toClick(id){
-       this.$router.push({path:"/purchase/order/edit?id="+id})
+     editGoodReturn(id){
+       this.$router.push({path:"/good/return/edit?id="+id})
      }
   },
   created() {
@@ -332,7 +335,7 @@ export default {
     this.start_time = monthStartDate
     this.org_id =  this.$store.getters.xt_user.org_id
     this.getAllSupply()
-    // this.getlist()
+    this.getlist()
   },
  
 };
@@ -389,4 +392,10 @@ export default {
   background-color: #d0d3da;
 }
 
+.el-table__fixed-right {
+  width: 150px;
+  bottom: 20px;
+  height: 100%;
+}
+
 </style>