Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

config/dev.env.js

@@ -7,8 +7,8 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  // BASE_API: '"http://api.xt.test.sgjyun.com"',
-  BASE_API: '"http://localhost:9529"',
+  BASE_API: '"http://api.xt.test.sgjyun.com"',
+  // BASE_API: '"http://localhost:9529"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

src/api/supply.js

@@ -157,56 +157,58 @@ export function getAllGoodReturnOrderList(params) {
     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 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({
@@ -239,3 +241,38 @@ export function deleteGoodOrder(id, params) {
     params: params
   })
 }
+
+export function getSupplyWarehouseOutById(id, params) {
+  return request({
+    url: '/api/supply/getsupplywarehouseoutbyid?id=' + id,
+    method: 'get',
+    params: params
+  })
+}
+
+export function delcontactone(params) {
+  return request({
+    url: '/api/supply/delcontactone',
+    method: 'get',
+    params: params
+  })
+}
+
+export function savesupply(data) {
+  return request({
+    url: '/api/supply/savesupply',
+    method: 'post',
+    data: data
+  })
+}
+
+export function updatesupply(data) {
+  return request({
+    url: '/api/supply/updatesupply',
+    method: 'post',
+    data: data
+  })
+}
+
+
+

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,'采购管理')">
-          <i class="iconfont icon-kccx navIcon"></i>
+        <!-- <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/data/components/addDrugs.vue

@@ -354,7 +354,7 @@
                             </el-date-picker>
                         </el-form-item>
                       
-                        <!-- <el-form-item label="是否零用:">
+                        <el-form-item label="是否零用:">
 
                             <el-select v-model="form.is_user" style="width:160px" filterable placeholder="请选择">
                                 <el-option
@@ -364,7 +364,7 @@
                                         :value="item.id">
                                 </el-option>
                             </el-select>
-                        </el-form-item> -->
+                        </el-form-item>
                       
 
                         <el-form-item label="药品备注:">
@@ -595,7 +595,7 @@
           prescribing_number_unit:"",
           total:"",
           specification_name:"",
-          is_user:2,
+          is_user:"2",
         },
 
         rules: {
@@ -648,11 +648,11 @@
         minNumberShow:false,
         packingUnit:[],
         userList: [{
-          id: '1',
-          name: '是'
+          id: "1",
+          name: "是"
         }, {
-          id: '2',
-          name: '否'
+          id: "2",
+          name: "否"
         }],
       }
     },
@@ -781,6 +781,7 @@
           }
 
           this.form['lmt_used_flag'] = 0
+          this.form['is_user'] = "2"
 
         } else {
           for (let key in obj) {

src/xt_pages/supply/components/addGoodOrder.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"
@@ -28,7 +27,6 @@
         align="right"
         format="yyyy-MM-dd"
         value-format="yyyy-MM-dd"
-        @change="startTimeChange"
         ></el-date-picker>
         <!-- <span>交货日期:</span> -->
         <!-- <el-date-picker
@@ -52,7 +50,7 @@
          <el-button size="small" type="primary" @click="updateGoodOrder" v-show="showTwo">保存</el-button>
         <el-button size="small" type="primary"  @click="checkPurchaseOrder">审核</el-button>
 
-       
+
     </div>
     </div>
 
@@ -75,7 +73,7 @@
         </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-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"
@@ -91,13 +89,13 @@
             <span>商品类别</span>
         </template>
         <template slot-scope="scope">
-            <el-input v-model="scope.row.supply_type" style="width:120px" :disabled="true"></el-input>
+            <el-input v-model="scope.row.supply_type" style="width:120px" :disabled="true"  placeholder="商品类别"></el-input>
             <div style="visibility: hidden">/</div>
         </template>
     </el-table-column>
-    <el-table-column label="规格&单位" align="center" width="120px">
+    <el-table-column label="规格&单位" align="center" width="150px">
         <template slot-scope="scope">
-            <el-input v-model="scope.row.supply_specification_name" style="width:100px" :disabled="true"></el-input>
+            <el-input v-model="scope.row.supply_specification_name" style="width:120px" :disabled="true" placeholder="规格&单位"></el-input>
             <div style="visibility: hidden">/</div>
         </template>
     </el-table-column>
@@ -115,16 +113,16 @@
                         :value="item.name">
                     </el-option>
              </el-select>
-          </el-form-item>  
+          </el-form-item>
         </template>
     </el-table-column>
-    <el-table-column label="批号" align="center" width="130px">
+    <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_batch_number'" :rules='tableRules.supply_batch_number'>
-             <el-input v-model="scope.row.supply_batch_number" style="width:80px" :disabled="disabled"></el-input>
+             <el-input v-model="scope.row.supply_batch_number" style="width:180px" :disabled="disabled" placeholder="请输入批号"></el-input>
           </el-form-item>
         </template>
     </el-table-column>
@@ -142,26 +140,26 @@
              </el-form-item>
        </template>
     </el-table-column>
-    <el-table-column label="可用库存" align="center" width="100px">
+    <el-table-column label="可用库存" align="center" width="150px">
         <template slot-scope="scope">
-            <el-input v-model="scope.row.supply_total" style="width:80px" :disabled="true"></el-input>
+            <el-input v-model="scope.row.supply_total" style="width:100px" :disabled="true"></el-input>
             <div style="visibility: hidden">/</div>
         </template>
     </el-table-column>
-    <el-table-column label="数量" align="center" width="120px">
+    <el-table-column label="数量" align="center" width="140px">
         <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-input v-model="scope.row.supply_count" style="width:100px" :disabled="disabled" placeholder="请输入数量"></el-input>
           </el-form-item>
         </template>
     </el-table-column>
 
-    <el-table-column label="采购单价" align="center" width="120px">
+    <el-table-column label="采购单价" align="center" width="180px">
         <template slot-scope="scope">
-        <el-input v-model="scope.row.supply_price" style="width:80px" :disabled="disabled"></el-input>
+        <el-input v-model="scope.row.supply_price" style="width:140px" :disabled="disabled"  placeholder="请输入采购单价"></el-input>
         <div style="visibility: hidden">/</div>
         </template>
     </el-table-column>
@@ -216,7 +214,7 @@
 
     <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>
+        <el-input v-model="scope.row.supply_remake" style="width:160px" :disabled="disabled" placeholder="请输入备注"></el-input>
         <div style="visibility: hidden">/</div>
         </template>
     </el-table-column>
@@ -243,17 +241,28 @@
         </template>
     </el-table-column>
   </el-table>
+   <div style="margin-top: 10px">
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="备注信息"
+          v-model="return_remark"
+        >
+        </el-input>
+   </div>
 </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:150px" v-model="rate_of_concession" placeholder="请输入优惠率"></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:150px" v-model="discount_amount" placeholder="请输入优惠金额"></el-input></span>
 
+        <span>本次付款:<el-input style="width:150px" v-model="payment" placeholder="请输入本次付款"></el-input></span>
+
+        <span>本次欠款:<el-input style="width:150px" v-model="arrearage" placeholder="请输入本次欠款"></el-input></span>
+    </div>
         <span>本次欠款:<el-input style="width:100px" v-model="arrearage"></el-input></span>
     </div> -->
     <Computed :total="total_price" :rate_of_concession="rate_of_concession" :discount_amount="discount_amount"></Computed>
@@ -346,6 +355,7 @@ return {
    showOne:true,
    showTwo:false,
    warese_out_id:0,
+   return_remark:"",
   };
 },
 methods:{
@@ -392,8 +402,8 @@ getInitOrder(){
         if(drugList[i].max_unit == drugList[i].min_unit){
           drugList[i].unitList = [{id:1,name:""}]
         }
-       
-        drugList[i].supply_unit = drugList[i].max_unit 
+
+        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
@@ -433,19 +443,19 @@ getInitOrder(){
         goodList[i].unitList =  [{id:1,name:""}]
         goodList[i].supply_unit = goodList[i].packing_unit
         for(let j=0;j<goodList[i].unitList.length;j++){
-           goodList[i].unitList[0].name = goodList[i].packing_unit 
+           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
@@ -471,7 +481,7 @@ changeName(val){
         this.recordInfo.tableList[i].unitList = val.unitList
      }
     }
-   
+
 
 },
 handleEdit(){
@@ -507,20 +517,6 @@ handleDelete: function(index, row) {
         this.recordInfo.tableList.splice(index, 1)
    }
 },
-
-changeTypeName(){
-
-},
-startTimeChange(){
-
-},
-endTimeChange(){
-
-},
-search(){
-
-},
-
 getWarehoseInfo(arr,max_unit,min_unit,min_number){
     var total = 0
     var max_str=  ""
@@ -574,7 +570,7 @@ getTimes(time) {
    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){
@@ -582,21 +578,21 @@ getTimes(time) {
     confirmButtonText: '确 定',
     cancelButtonText: '取 消',
     type: 'warning'
-    }).then(() => { 
+    }).then(() => {
     checkPurchaseOrder(this.id).then(response => {
         if (response.data.state == 1) {
           var info = response.data.data.info
           this.disabled = true
           this.$message.success("审核成功!")
           this.getPurchaseOrderDetail()
-        } 
+        }
      })
     })
     .catch(() => {
-    }) 
+    })
   },
   getPurchaseOrderDetail(){
-     
+
       var id = this.$route.query.id
       var ids = this.$route.query.ids
     getPurchaseOrderInfo(id,ids).then(response=>{
@@ -609,7 +605,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 = ""
@@ -640,36 +636,36 @@ getTimes(time) {
                     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})  
+     this.$router.push({path:"/purchase/order/print?&id="+id})
   },
-  saveGoodOrder(){ 
-   
+  saveGoodOrder(){
+
     if(this.supplier_name == 0 || this.supplier_name == ""){
        this.$message.error("供应商不能为空!")
        this.loading = false
        return false
-    } 
+    }
 
     for(let i=0;i<this.recordInfo.tableList.length;i++){
 
@@ -677,7 +673,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()
-       
+
         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
@@ -694,10 +690,11 @@ getTimes(time) {
            this.loading = true
            var warehousing_id = this.$route.query.id
            var params = {
-             "stockIn":this.recordInfo.tableList,
+             stockIn:this.recordInfo.tableList,
+             return_remake:this.return_remark,
            }
-        console.log("stockIN2323322332322323",params)  
-       
+        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
@@ -713,6 +710,7 @@ getTimes(time) {
              this.payment =warehouseOut.payment
              this.arrearage =warehouseOut.arrearage
              this.supplier_name = warehouseOut.supplier_id
+             this.return_remake = warehouseOut.return_remake
              this.start_time = this.getTimes(warehouseOut.document_date)
             for(let i=0;i< orderInfo.length;i++){
               orderInfo[i].supply_count =  orderInfo[i].count
@@ -737,32 +735,32 @@ getTimes(time) {
                       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
-            
+
            }
          })
         }
     })
   },
-  updateGoodOrder(){ 
-   
+  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++){
 
@@ -770,7 +768,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()
-        
+
         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
@@ -787,15 +785,16 @@ getTimes(time) {
            this.loading = true
            var warehose_out_id = this.$route.query.id
            var params = {
-             "stockIn":this.recordInfo.tableList,
-           } 
+             stockIn:this.recordInfo.tableList,
+             return_remake:this.return_remake,
+           }
            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("保存成功!")
-             
+
            }
          })
         }

src/xt_pages/supply/components/addGoodReturn.vue

@@ -96,7 +96,7 @@
                   v-model="scope.row.name"
                   style="width: 160px"
                   filterable
-                  placeholder="请选择"
+                  placeholder="请选择商品"
                   @change="changeName"
                   @input="changeGoodName(scope.$index)"
                   :disabled="disabled"
@@ -121,6 +121,7 @@
                 v-model="scope.row.supply_type"
                 style="width: 120px"
                 :disabled="true"
+                placeholder="商品类别"
               ></el-input>
             </template>
           </el-table-column>
@@ -130,6 +131,7 @@
                 v-model="scope.row.supply_specification_name"
                 style="width: 150px"
                 :disabled="true"
+                 placeholder="规格&单位"
               ></el-input>
             </template>
           </el-table-column>
@@ -166,6 +168,7 @@
                 v-model="scope.row.supply_specification_name"
                 style="width: 150px"
                 :disabled="true"
+                placeholder="可退数量"
               ></el-input>
             </template>
           </el-table-column>
@@ -187,17 +190,18 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="购货单价" align="center" width="120px">
+          <el-table-column label="采购单价" align="center" width="180px">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.supply_price"
-                style="width: 80px"
+                style="width: 140px"
                 :disabled="disabled"
+                 placeholder="请输入采购单价"
               ></el-input>
             </template>
           </el-table-column>
 
-          <el-table-column label="购货金额" align="center" width="120px">
+          <el-table-column label="采购金额" align="center" width="120px">
             <template slot-scope="scope">
               {{ calculate(scope.row.supply_count * scope.row.supply_price) }}
             </template>
@@ -250,6 +254,7 @@
                 v-model="scope.row.supply_remake"
                 style="width: 160px"
                 :disabled="disabled"
+                placeholder="请输入备注"
               ></el-input>
             </template>
           </el-table-column>

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -14,7 +14,7 @@
       >
         <div>
           <span style="color: red">*</span><span>供应商:</span>
-          <el-select cxpib`*+9.`
+          <el-select
             v-model="supplier_name"
             style="width: 140px; margin-right: 10px"
             placeholder="请选择"
@@ -191,7 +191,7 @@
               <div style="visibility: hidden">/</div>
             </template>
           </el-table-column>
-          <el-table-column label="数量" align="center" width="120px">
+          <el-table-column label="数量" align="center" width="180px">
             <template slot="header" slot-scope="scope">
               <span>数量<span style="color: red">*</span></span>
             </template>
@@ -203,8 +203,9 @@
               >
                 <el-input
                   v-model="scope.row.supply_count"
-                  style="width: 80px"
+                  style="width: 140px"
                   :disabled="disabled"
+                  placeholder="请输入数量"
                 ></el-input>
               </el-form-item>
             </template>
@@ -309,6 +310,15 @@
             </template>
           </el-table-column>
         </el-table>
+         <div style="margin-top: 10px">
+        <el-input
+          type="textarea"
+          :rows="2"
+          placeholder="备注信息"
+          v-model="return_remark"
+        >
+        </el-input>
+       </div>
         <!-- 审核水印 -->
         <img src="@/assets/purchase/Reviewed.png" alt="正在加载..." class="reviewImg" v-show="Reviewed == true" />
 
@@ -317,19 +327,19 @@
       <div style="margin-top: 10px">
         <span
           >优惠率:<el-input
-            style="width: 100px"
+            style="width: 150px"
             v-model="rate_of_concession"
             @input="addressChange"
-            @placeholder="请输入优惠率"
+            placeholder="请输入优惠率"
           ></el-input
           >%</span
         >
 
         <span
           >优惠金额:<el-input
-            style="width: 100px"
+            style="width: 150px"
             v-model="discount_amount"
-            @placeholder="请输入优惠金额"
+            placeholder="请输入优惠金额"
           ></el-input
         ></span>
       </div>
@@ -351,21 +361,7 @@ import {
 import { getDataConfig } from "@/utils/data";
 export default {
   name: "addPurchaseOrder",
-  created() {
-    this.org_id = this.$store.getters.xt_user.org_id;
-
-    var start_time = window.sessionStorage.getItem("start_time");
-    var end_time = window.sessionStorage.getItem("end_time");
 
-    if (start_time != null) {
-      this.start_time = start_time;
-    }
-    if (end_time != null) {
-      this.end_time = end_time;
-    }
-    window.sessionStorage.removeItem("start_time");
-    window.sessionStorage.removeItem("end_time");
-  },
   components: {
     BreadCrumb,
   },
@@ -430,130 +426,103 @@ export default {
       ],
       goodList: [{ id: 1, name: "" }],
       total_price: 0,
+      return_remark:"",
     };
   },
   methods: {
-    getInitOrder() {
-      getInitOrder().then((response) => {
-        if (response.data.state == 1) {
-          var drugList = response.data.data.drugList;
-
-          this.manufactuerList = response.data.data.manufactuerList;
-          this.goodTypeList = response.data.data.goodTypeList;
-          this.drugTypeList = response.data.data.drugTypeList;
-          this.supplyList = response.data.data.supplyList;
-          for (let i = 0; i < drugList.length; i++) {
-            for (let z = 0; z < drugList[i].drug_warehouse_info.length; z++) {
-              drugList[i].drug_warehouse_info[z].stock_max_number =
-                drugList[i].drug_warehouse_info[z].stock_max_number *
-                drugList[i].min_number;
-            }
-            for (let j = 0; j < this.manufactuerList.length; j++) {
-              if (drugList[i].manufacturer == this.manufactuerList[j].id) {
-                drugList[i].manufacturer =
-                  this.manufactuerList[j].manufacturer_name;
-              }
+   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 y = 0; y < this.drugTypeList.length; y++) {
-              if (drugList[i].drug_type == this.drugTypeList[y].value) {
-                drugList[i].drug_type = this.drugTypeList[y].name;
-              }
+          }
+        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
             }
-            drugList[i].supply_name =
-              drugList[i].drug_name +
-              " " +
-              drugList[i].dose +
-              drugList[i].dose_unit +
-              "*" +
-              drugList[i].min_number +
-              drugList[i].min_unit +
-              "/" +
-              drugList[i].max_unit +
-              " " +
-              drugList[i].manufacturer;
-            drugList[i].supply_type = drugList[i].drug_type;
-            drugList[i].supply_specification_name =
-              drugList[i].dose +
-              drugList[i].dose_unit +
-              "*" +
-              drugList[i].min_number +
-              drugList[i].min_unit +
-              "/" +
-              drugList[i].max_unit;
-            drugList[i].supply_total = this.getWarehoseInfo(
-              drugList[i].drug_warehouse_info,
-              drugList[i].max_unit,
-              drugList[i].min_unit,
-              drugList[i].min_number
-            );
-            drugList[i].supply_count = "";
-            drugList[i].supply_total_price = "";
-            drugList[i].supply_manufacturer = drugList[i].manufacturer;
-            drugList[i].supply_license_number = drugList[i].number;
-            drugList[i].supply_remake = "";
-            drugList[i].type = 1;
-            drugList[i].supply_price = drugList[i].last_price;
-            drugList[i].name = drugList[i].drug_name;
-            drugList[i].supply_unit = drugList[i].max_unit;
-            drugList[i].unitList = [
-              { id: 1, name: "" },
-              { id: 2, name: "" },
-            ];
-            for (let j = 0; j < drugList[i].unitList.length; j++) {
-              drugList[i].unitList[0].name = drugList[i].max_unit;
-              drugList[i].unitList[1].name = drugList[i].min_unit;
+        }
+        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
             }
-            this.tabList.push(drugList[i]);
+        }
+        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].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
           }
-          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;
-              }
+          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
             }
-            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].supply_unit = goodList[i].packing_unit;
-            goodList[i].unitList = [
-              { id: 1, name: "" },
-              { id: 2, name: "" },
-            ];
-            for (let j = 0; j < goodList[i].unitList.length; j++) {
-              goodList[i].unitList[0].name = goodList[i].packing_unit;
+        }
+        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
             }
-            this.tabList.push(goodList[i]);
-          }
-          this.goodList = goodList;
         }
-      });
-    },
+        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
+        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
+        console.log(this.goodList,'oo')
+    } 
+    })
+},
     changeGoodName(val) {
       this.currentIndex = val;
     },
@@ -659,6 +628,7 @@ export default {
           var end = this.getTimes(this.end_time);
           const params = {
             stockIn: this.recordInfo.tableList,
+            return_remake:this.return_remark,
           };
 
           console.log("params23322323", params);
@@ -681,6 +651,7 @@ export default {
               this.number = warehouseInfo.number;
               this.id = warehouseInfo.id;
               this.recordInfo.tableList = [];
+              this.return_remark = warehouseInfo.return_remake
               var orderInfo = response.data.data.orderInfo;
               for (let i = 0; i < orderInfo.length; i++) {
                 if (orderInfo[i].is_source == 1) {
@@ -824,6 +795,7 @@ export default {
           var end = this.getTimes(this.end_time);
           const params = {
             stockIn: this.recordInfo.tableList,
+            return_remake:this.return_remark,
           };
           console.log("params23232233223", params);
 
@@ -978,4 +950,4 @@ export default {
   bottom: 20px;
   height: 100%;
 }
-</style>
+</style>

src/xt_pages/supply/components/addSupply.vue

@@ -72,7 +72,7 @@
             backgroundColor: 'rgb(245, 247, 250)',
             color: '#606266',
           }"
-          :data="recordInfo.tableList"
+          :data="recordInfo.contacts"
           :class="signAndWeighBoxPatients"
           border
           style="width: 100%"
@@ -85,8 +85,8 @@
             </template>
             <template slot-scope="scope">
               <el-form-item
-                :prop="'tableList.' + scope.$index + '.supply_count'"
-                :rules="tableRules.contacts"
+                :prop="'contacts.' + scope.$index + '.name'"
+                :rules="tableRules.name"
               >
                 <el-input
                   v-model="scope.row.name"
@@ -121,10 +121,10 @@
               <span>首要联系人<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
-              <el-form-item :prop="'tableList.' + scope.$index + '.name'">
-                <!-- :prop="'tableList.' + scope.$index + '.name'"  如需添加可在上方标签加入 -->
+              <el-form-item :prop="'contacts.' + scope.$index + '.name'">
+                <!-- :prop="'contacts.' + scope.$index + '.name'"  如需添加可在上方标签加入 -->
                 <el-select
-                  v-model="scope.row.is_first"
+                  v-model="scope.row.isfirst"
                   style="width: 90px"
                   placeholder="请选择"
                   @change="changeName($event, scope)"
@@ -133,7 +133,7 @@
                     v-for="(item, index) in tabList"
                     :key="index"
                     :label="item.label"
-                    :value="item"
+                    :value="item.value"
                   >
                   </el-option>
                 </el-select>
@@ -186,7 +186,7 @@
 
     <span slot="footer" class="dialog-footer">
       <el-button @click="closePop">取 消</el-button>
-      <el-button type="primary" @click="submitForm('supplier')"
+      <el-button type="primary" @click="submitForm('supplier', 'recordInfo')"
         >确 定</el-button
       >
     </span>
@@ -198,25 +198,30 @@ import {
   getSupplierId,
   getsupplytype,
   getsupplyandcontactone,
+  delcontactone,
+  savesupply,
+  updatesupply,
 } from "@/api/supply";
 import Template from "../../data/template.vue";
 export default {
   data() {
     return {
+      show_type: 1,
+      supplier_ids: "",
       title: "",
       Template,
       signAndWeighBoxPatients: "sign-and-weigh-box-patients",
       list: ["001", "002"],
       // 表单验证规则
       rules: {
-        id: [
+        supplierCode: [
           {
             required: true,
             message: "请填写供应商编号",
             trigger: "blur",
           },
         ],
-        name: [
+        supplierName: [
           {
             required: true,
             message: "请填写供应商名称",
@@ -226,21 +231,19 @@ export default {
       },
       tabList: [
         {
-          value: 0,
+          value: 1,
           label: "是",
         },
         {
-          value: 1,
+          value: 0,
           label: "否",
         },
       ],
       tableRules: {
-        contacts: [
-          { required: true, message: "联系人不能为空", trigger: "blur" },
-        ],
+        name: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
       },
       recordInfo: {
-        tableList: [{}],
+        contacts: [{}],
       },
       tableData: [
         {
@@ -251,23 +254,12 @@ export default {
           operate: "",
         },
       ],
-      options: [
-        {
-          value: "1",
-          label: "是",
-        },
-        {
-          value: "2",
-          label: "否",
-        },
-      ],
-      value: "",
       dialogVisible: false,
       supplier: {
-        supplierName: "a",
+        supplierName: "",
         supplierCode: "gsy001",
         supplierType: "",
-        vatRate: 10,
+        vatRate: "",
         number: "",
         bank: "",
         bankAccount: "",
@@ -285,9 +277,12 @@ export default {
     show(data, type) {
       if (type == 1) {
         this.initSupplierData();
+        this.show_type = 1;
         this.title = "新增供应商";
         this.dialogVisible = true;
       } else if (type == 2) {
+        this.show_type = 2;
+        this.supplier_ids = data.ID;
         this.title = "编辑供应商";
         this.supplier.supplierCode = data.SupplierCode;
         this.supplier.supplierName = data.SupplierName;
@@ -310,36 +305,15 @@ export default {
       this.supplier.number = "";
       this.supplier.bank = "";
       this.supplier.bankAccount = "";
-      this.recordInfo.tableList = [{}];
+      this.recordInfo.contacts = [{}];
     },
 
     // 获取供应商编码接口
     initSupplierData() {
-      let Arr = [];
       getSupplierId().then((res) => {
-        Arr = res.data.data;
-        Arr.supplycode.forEach((o) => {
-          this.supply_code.push(o.supplier_code);
-        });
-      });
-      this.orderIdAdd();
-    },
-
-    // 供应商编码动态递增
-    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}`;
+        if (res.data.state == 1) {
+          this.supplier.supplierCode =
+            res.data.data.supplycode[0].supplier_code;
         }
       });
     },
@@ -376,21 +350,57 @@ export default {
     },
 
     handleSelect(item) {
-      console.log(item, "l");
       this.supplier.name = item.value;
       this.supplier.value = item.name;
     },
 
     //  验证表单内容
-    submitForm(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          alert("submit!");
-          this.dialogVisible = false;
-        } else {
-          return false;
-        }
-      });
+    submitForm(supplier, formName) {
+      if (this.show_type == 1) {
+        this.$refs[supplier].validate((valid) => {
+          if (valid) {
+            this.$refs[formName].validate((valid) => {
+              if (valid) {
+                let params = {
+                  ...this.supplier,
+                  ...this.recordInfo,
+                };
+                console.log(params, "dhas");
+                savesupply(params).then((res) => {});
+              } else {
+                return false;
+              }
+            });
+
+            this.dialogVisible = false;
+          } else {
+            return false;
+          }
+        });
+      } else if (this.show_type == 2) {
+        this.$refs[supplier].validate((valid) => {
+          if (valid) {
+            this.$refs[formName].validate((valid) => {
+              if (valid) {
+                let params = {
+                  ...this.supplier,
+                  ...this.recordInfo,
+                };
+                console.log(params, "dhas");
+                updatesupply(params).then((res) => {
+                  console.log(res, "oo");
+                });
+              } else {
+                return false;
+              }
+            });
+
+            this.dialogVisible = false;
+          } else {
+            return false;
+          }
+        });
+      }
 
       this.contactsinfo();
     },
@@ -402,74 +412,92 @@ export default {
         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();
+          this.recordInfo.contacts = res.data.data.contact;
+          if (this.recordInfo.contacts.length == 0) {
+            this.recordInfo.contacts = [{}];
+            this.recordInfo.contacts[0].isfirst = data;
+          } else if (this.recordInfo.contacts.length == 1) {
+            let val = res.data.data.contact[0];
+            this.recordInfo.contacts[0].isfirst = data;
+            this.recordInfo.contacts[0] = {
+              name: val.name,
+              address: val.address,
+              phone: val.phone,
+              isfirst: val.is_first,
+            };
           } else {
-            this.recordInfo.tableList.forEach((o) => {
-              if (o.is_first == 0) {
-                o.is_first = "否";
-              } else if (o.is_first == 1) {
-                o.is_first = "是";
+            this.recordInfo.contacts.forEach((o) => {
+              if (o.isfirst == 0) {
+                this.tabList.label = "否";
+              } else if (o.isfirst == 1) {
+                this.tabList.label = "是";
               }
             });
           }
-
-          console.log(this.recordInfo.tableList, "this.recordInfo.tableList");
         }
       });
-
-      if (this.recordInfo.tableList.length == 1) {
-        this.recordInfo.tableList[0].is_first = data;
-        this.$forceUpdate();
-      }
     },
 
     // 首要联系人选择变更动态展示
     changeName(data, scope) {
       let data1 = {
-        value: 1,
+        value: 0,
         label: "否",
       };
-
       let data2 = {
-        value: 0,
+        value: 1,
         label: "是",
       };
       let arr = [];
-      if (this.recordInfo.tableList.length == 1) {
-        this.recordInfo.tableList[0] = data2;
-        this.$forceUpdate();
-      }
-      this.recordInfo.tableList.forEach((el, index) => {
-        if (scope.$index == index) {
-          el.is_first = data;
-          // console.log(scope);
-          this.$forceUpdate();
+      if (this.recordInfo.contacts.length <= 1) {
+        this.recordInfo.contacts[0].isfirst = data2.value;
+      } else {
+        this.recordInfo.contacts.forEach((el, index) => {
+          console.log(scope.$index, index, "oo");
+          if (scope.$index == index) {
+            el.isfirst = data;
+          } else {
+            el.isfirst = data1.value;
+          }
+          arr.push(el.isfirst);
+        });
+        if (arr.includes(1)) {
+          return;
         } else {
-          el.is_first = data1;
-          this.$forceUpdate();
+          this.recordInfo.contacts[0].isfirst = data2.value;
         }
-        arr.push(el.is_first.value);
-      });
-      if (arr.includes(0)) {
-        return;
-      } else {
-        this.recordInfo.tableList[0].is_first = data2;
       }
     },
 
     // 添加表单行
     handleAdd() {
       let data = {};
-      this.recordInfo.tableList.push(data);
+      this.recordInfo.contacts.push(data);
     },
     // 删除表单行
-    handleDelete() {},
+    handleDelete(index, data) {
+      let params = {
+        id: data.id,
+      };
+
+      if (this.show_type == 1) {
+        if (this.recordInfo.contacts.length <= 1) {
+          return;
+        } else {
+          this.recordInfo.contacts.splice(index, 1);
+        }
+      } else if (this.show_type == 2) {
+        delcontactone(params).then((res) => {
+          if (res.data.data.list == "删除成功") {
+            this.$message.success(res.data.data.list);
+            this.getcontacts(this.supplier_ids);
+          } else {
+            this.$message.error(res.data.data.list);
+          }
+        });
+      }
+    },
 
     //表格判断是否填入信息
     contactsinfo() {

src/xt_pages/supply/components/editGoodOrder.vue

@@ -91,13 +91,13 @@
             <span>商品类别</span>
         </template>
         <template slot-scope="scope">
-            <el-input v-model="scope.row.supply_type" style="width:120px" :disabled="true"></el-input>
+            <el-input v-model="scope.row.supply_type" style="width:120px" :disabled="true" placeholder="商品类别"></el-input>
             <div style="visibility: hidden">/</div>
         </template>
     </el-table-column>
-    <el-table-column label="规格&单位" align="center" width="120px">
+    <el-table-column label="规格&单位" align="center" width="150px">
         <template slot-scope="scope">
-            <el-input v-model="scope.row.supply_specification_name" style="width:100px" :disabled="true"></el-input>
+            <el-input v-model="scope.row.supply_specification_name" style="width:120px" :disabled="true" placeholder="规格&单位"></el-input>
             <div style="visibility: hidden">/</div>
         </template>
     </el-table-column>
@@ -118,13 +118,13 @@
           </el-form-item>  
         </template>
     </el-table-column>
-    <el-table-column label="批号" align="center" width="130px">
+    <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_batch_number'" :rules='tableRules.supply_batch_number'>
-             <el-input v-model="scope.row.supply_batch_number" style="width:80px" :disabled="disabled"></el-input>
+             <el-input v-model="scope.row.supply_batch_number" style="width:180px" :disabled="disabled" placeholder="请输入批号"></el-input>
           </el-form-item>
         </template>
     </el-table-column>
@@ -142,9 +142,9 @@
              </el-form-item>
        </template>
     </el-table-column>
-    <el-table-column label="可用库存" align="center" width="100px">
+    <el-table-column label="可用库存" align="center" width="150px">
         <template slot-scope="scope">
-            <el-input v-model="scope.row.supply_total" style="width:80px" :disabled="true"></el-input>
+            <el-input v-model="scope.row.supply_total" style="width:100px" :disabled="true"></el-input>
             <div style="visibility: hidden">/</div>
         </template>
     </el-table-column>
@@ -154,14 +154,14 @@
         </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-input v-model="scope.row.supply_count" style="width:80px" :disabled="disabled" placeholder="请输入数量"></el-input>
           </el-form-item>
         </template>
     </el-table-column>
 
-    <el-table-column label="采购单价" align="center" width="120px">
+    <el-table-column label="采购单价" align="center" width="180px">
         <template slot-scope="scope">
-        <el-input v-model="scope.row.supply_price" style="width:80px" :disabled="disabled"></el-input>
+        <el-input v-model="scope.row.supply_price" style="width:140px" :disabled="disabled" placeholder="请输入采购单价"></el-input>
         <div style="visibility: hidden">/</div>
         </template>
     </el-table-column>
@@ -216,7 +216,7 @@
 
     <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>
+        <el-input v-model="scope.row.supply_remake" style="width:160px" :disabled="disabled" placeholder="请输入备注"></el-input>
         <div style="visibility: hidden">/</div>
         </template>
     </el-table-column>
@@ -243,33 +243,31 @@
         </template>
     </el-table-column>
   </el-table>
+   <div style="margin-top: 10px">
+      <el-input
+        type="textarea"
+        :rows="2"
+        placeholder="备注信息"
+        v-model="return_remark"
+      >
+      </el-input>
+  </div>
 </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:150px" v-model="rate_of_concession" placeholder="请输入优惠率"></el-input>%</span>
 
-        <span>优惠金额:<el-input style="width:100px" v-model="discount_amount"></el-input></span>
+        <span>优惠金额:<el-input style="width:150px" v-model="discount_amount" placeholder="请输入优惠金额"></el-input></span>
       
-        <span>本次付款:<el-input style="width:100px" v-model="payment"></el-input></span>
+        <span>本次付款:<el-input style="width:150px" v-model="payment" placeholder="请输入本次付款"></el-input></span>
 
-        <span>本次欠款:<el-input style="width:100px" v-model="arrearage"></el-input></span>
+        <span>本次欠款:<el-input style="width:150px" v-model="arrearage" placeholder="请输入本次欠款"></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>
 
@@ -277,7 +275,7 @@
 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,MofyGoodOrder,UpdateSupplyWahouseingInfo} from "@/api/supply"
+import {getInitOrder,checkPurchaseOrder,getGoodOrderDetail,updateGoodOrder,getGoodOrderCountList,ModefySupplyWarehousing,MofyGoodOrder,UpdateSupplyWahouseingInfo,getSupplyWarehouseOutById} from "@/api/supply"
 export default {
 name: "addPurchaseOrder",
 components: {
@@ -344,7 +342,7 @@ return {
    good_number:"",
    orderInfo:[],
    warese_out_id:0,
-   
+   return_remark:"",
   };
 },
 methods:{
@@ -613,6 +611,7 @@ getTimes(time) {
         this.arrearage = out.arrearage
         this.number = out.number
         this.good_number = out.good_number
+        this.return_remark = out.return_remake
         this.start_time = this.getTimes(out.document_date)
         var orderInfo = response.data.data.list
         
@@ -696,7 +695,8 @@ getTimes(time) {
            this.loading = true
            var warehose_out_id = this.$route.query.id
            var params = {
-             "stockIn":this.recordInfo.tableList,
+             stockIn:this.recordInfo.tableList,
+             return_remake:this.return_remark,
            } 
            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){
@@ -820,6 +820,27 @@ getTimes(time) {
     })
   },
   toClick(){
+    //先判断采购单号有没有关联的采购退货单号，如果没有，则为首次生成采购退货单
+     if(this.is_check == 2){
+      this.$message.error("该采购单未审核,不能生成退货单数据!")
+      return false
+     }
+     var id = this.$route.query.id
+    getSupplyWarehouseOutById(id).then(response=>{
+      if(response.data.state == 1){
+        var cancelList = response.data.data.cancelList
+        console.log("cancelList23232232323323223",cancelList)
+        if(cancelList.length >0){
+
+        }
+        var outList = response.data.data.outList
+        console.log("outList2332232332",outList)
+        var cancelOrderList = response.data.data.cancelOrderList
+        console.log("cancelOrderList2323322322332",cancelOrderList)
+        var drugList = response.data.data.drugList
+        console.log("drugList233223232323232",drugList)
+      }
+    })
     this.$router.push({path:"/good/return/add?id="+this.id})
   },
   //反审核

src/xt_pages/supply/components/editGoodReturn.vue

@@ -92,7 +92,7 @@
                   v-model="scope.row.name"
                   style="width: 160px"
                   filterable
-                  placeholder="请选择"
+                  placeholder="请选择商品"
                   @change="changeName"
                   @input="changeGoodName(scope.$index)"
                   :disabled="disabled"
@@ -117,6 +117,7 @@
                 v-model="scope.row.supply_type"
                 style="width: 120px"
                 :disabled="true"
+                placeholder="商品类别"
               ></el-input>
             </template>
           </el-table-column>
@@ -126,6 +127,7 @@
                 v-model="scope.row.supply_specification_name"
                 style="width: 150px"
                 :disabled="true"
+                placeholder="规格&单位"
               ></el-input>
             </template>
           </el-table-column>
@@ -168,6 +170,7 @@
           <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
@@ -178,22 +181,24 @@
                   v-model="scope.row.supply_count"
                   style="width: 80px"
                   :disabled="disabled"
+                  placeholder="请输入数量"
                 ></el-input>
               </el-form-item>
             </template>
           </el-table-column>
 
-          <el-table-column label="购货单价" align="center" width="120px">
+          <el-table-column label="采购单价" align="center" width="180px">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.supply_price"
-                style="width: 80px"
+                style="width: 140px"
                 :disabled="disabled"
+                placeholder="请输入采购单价"
               ></el-input>
             </template>
           </el-table-column>
 
-          <el-table-column label="购货金额" align="center" width="120px">
+          <el-table-column label="采购金额" align="center" width="120px">
             <template slot-scope="scope">
               {{ calculate(scope.row.supply_count * scope.row.supply_price) }}
             </template>
@@ -246,6 +251,7 @@
                 v-model="scope.row.supply_remake"
                 style="width: 160px"
                 :disabled="disabled"
+                placeholder="请输入备注"
               ></el-input>
             </template>
           </el-table-column>

src/xt_pages/supply/goodOrderQuery.vue

@@ -107,7 +107,7 @@
        </el-table-column>
         <el-table-column label="已付款" align="center">
          <template slot-scope="scope">
-           {{scope.row.payment}}
+           <span v-if="scope.row.payment >0">{{scope.row.payment}}</span> 
          </template>
        </el-table-column>
        <el-table-column label="数量" align="center">