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

@@ -239,3 +239,11 @@ export function deleteGoodOrder(id, params) {
     params: params
   })
 }
+
+export function getSupplyWarehouseOutById(id, params) {
+  return request({
+    url: '/api/supply/getsupplywarehouseoutbyid?id=' + id,
+    method: 'get',
+    params: params
+  })
+}

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

@@ -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="140px">
             <template slot="header" slot-scope="scope">
               <span>数量<span style="color: red">*</span></span>
             </template>
@@ -199,22 +199,22 @@
               <el-form-item
                 :prop="'tableList.' + scope.$index + '.supply_count'"
                 :rules="tableRules.supply_count"
-                 placeholder="请输入数量"
               >
                 <el-input
                   v-model="scope.row.supply_count"
-                  style="width: 80px"
+                  style="width: 100px"
                   :disabled="disabled"
+                  placeholder="请输入数量"
                 ></el-input>
               </el-form-item>
             </template>
           </el-table-column>
 
-          <el-table-column label="购货单价" align="center" width="140px">
+          <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>
@@ -309,6 +309,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 +326,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 +360,6 @@ 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,6 +424,7 @@ export default {
       ],
       goodList: [{ id: 1, name: "" }],
       total_price: 0,
+      return_remark:"",
     };
   },
   methods: {
@@ -659,9 +654,11 @@ export default {
           var end = this.getTimes(this.end_time);
           const params = {
             stockIn: this.recordInfo.tableList,
+            return_remake:this.return_remark,
           };
-
+          
           console.log("params23322323", params);
+          
           savePurchaseOrder(
             params,
             this.supplier_name,
@@ -675,10 +672,12 @@ export default {
               this.loading = false;
               this.$message.success("保存成功!");
               var warehouseInfo = response.data.data.warehouseInfo;
+            
               if(warehouseInfo.is_check == 1){
                 this.Reviewed = true
               }
               this.number = warehouseInfo.number;
+              this.return_remark = warehouseInfo.return_remake
               this.id = warehouseInfo.id;
               this.recordInfo.tableList = [];
               var orderInfo = response.data.data.orderInfo;
@@ -824,6 +823,7 @@ export default {
           var end = this.getTimes(this.end_time);
           const params = {
             stockIn: this.recordInfo.tableList,
+            return_remake:this.return_remake,
           };
           console.log("params23232233223", params);
 

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">