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

src/views/layout/Layout.vue

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

src/xt_pages/role/components/AdminRoleInfoForm.vue

@@ -43,7 +43,7 @@
       <el-form-item label="职位 : ">
         <el-input v-model="form.user_title_name" placeholder="输入职位"></el-input>
       </el-form-item>
-      
+
       <el-form-item label="介绍 : ">
         <Tinymce :height="400" menubar ref="editor" v-model="form.intro" :show_upload_img="false"/>
       </el-form-item>

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -60,7 +60,7 @@
         </div>
       </div>
 
-      
+
 
       <div class="cell clearfix">
         <el-checkbox
@@ -135,8 +135,8 @@
 
         <el-table-column label="操作" align="center" width="240">
           <template slot-scope="scope">
-           
-         
+
+
             <el-tooltip
               class="item"
               effect="dark"
@@ -261,7 +261,7 @@
           </el-table-column>
           <el-table-column label="批准文号" align="center">
             <template slot-scope="scope">
-             <span v-if="scope.row.number!=''">{{scope.row.number}}</span> 
+             <span v-if="scope.row.number!=''">{{scope.row.number}}</span>
              <span v-if="scope.row.number == '0'"></span>
             </template>
           </el-table-column>
@@ -323,7 +323,7 @@
               <span>{{scope.row.ctime | parseTime('{y}-{m}-{d} {h}:{i}')}} </span>
             </template>
           </el-table-column>
-      
+
         </el-table>
       </span>
       <span slot="footer" class="dialog-footer">
@@ -538,7 +538,7 @@ export default {
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.warehouseOutDate.push(response.data.data.list[i]);
           }
-         
+
         }
       });
     },
@@ -627,11 +627,11 @@ export default {
     },
 
     handleEdit: function(index, row) {
-   
+
       this.$router.push({path:"/drug/out/drugstockoutorderedit?id="+row.id+"&type="+this.type+"&is_sys="+row.is_sys+"&supply_cancel_out_id="+row.supply_cancel_out_id})
     },
     handleSearch(val){
-      
+
        this.getInitializtion()
        this.getSinleOrderDetail(val.id,val.warehouse_out_time,val.is_sys)
        this.list = []
@@ -688,7 +688,7 @@ export default {
       }
     },
     select(selection) {
-     
+
       var ids= []
       for(let i=0;i<selection.length;i++){
          ids.push(selection[i].id)
@@ -699,7 +699,7 @@ export default {
     },
     batchDelete() {
       console.log("232322323",this.selectedTableData)
-      
+
       if (this.selectedTableData.length <= 0) {
         this.$message.error("请选择要删除的记录");
         return;
@@ -718,7 +718,7 @@ export default {
       }
       if(idsOne.length > 0){
         this.$message.error("采购出库数据不能删除!")
-        return 
+        return
       }
       const idStr = ids.join(",");
       const params = {
@@ -755,7 +755,7 @@ export default {
     },
 
     jump(id){
-    
+
       this.GetOrderDetailTwo(id)
       this.userList=[]
       this.dialogVisibleTwo = true
@@ -779,13 +779,13 @@ export default {
               this.userList.push(obj)
               total = total + response.data.data.list[i].count
             }
-           
+
             this.userList.push({
               is_total: 1,
               total: total,
             })
 
-            
+
           }
         })
       },
@@ -845,7 +845,7 @@ export default {
            var list =   response.data.data.list
            this.list = list
            var drugConfig =  response.data.data.drugConfig
-         
+
            this.drugConfig = drugConfig
            var drugList = response.data.data.drugList
            this.drugList = drugList
@@ -855,8 +855,8 @@ export default {
       })
     },
     getDrugCount(id){
-      
-      var count = 0 
+
+      var count = 0
       for(let i=0;i<this.list.length;i++){
          if(this.list[i].drug_id == id){
             count = this.list[i].Total
@@ -897,7 +897,7 @@ export default {
      for(let i=0;i<this.drugTypeList.length;i++){
        if(id == this.drugTypeList[i].value){
            name = this.drugTypeList[i].name
-       } 
+       }
      }
      return name
    },
@@ -924,13 +924,13 @@ export default {
          id:id,
          start_time:start_time,
        }
-      console.log("is_sys22222",is_sys) 
+      console.log("is_sys22222",is_sys)
      getSinleOrderDetail(params).then(response=>{
         if(response.data.state == 1){
           this.tableShow = true
           this.tableList = []
           var list =  response.data.data.list
-         
+
          this.manufacturerList = response.data.data.manufacturerList
          this.dealerList = response.data.data.dealerList
          var drugFlowList = response.data.data.drugFlowList
@@ -940,7 +940,7 @@ export default {
                   drugFlowList[i].count = drugFlowList[i].count * drugFlowList[i].XtBaseDrug.min_number
               }
               if(drugFlowList[i].count_unit == drugFlowList[i].XtBaseDrug.min_unit){
-                  drugFlowList[i].count = drugFlowList[i].count 
+                  drugFlowList[i].count = drugFlowList[i].count
               }
 
            }
@@ -954,7 +954,7 @@ export default {
                   flowlist[i].count = flowlist[i].count * list[i].min_number
               }
               if(flowlist[i].count_unit == flowlist[i].min_unit){
-                  flowlist[i].count = flowlist[i].count 
+                  flowlist[i].count = flowlist[i].count
               }
             }
             this.drugFlowList = flowlist
@@ -985,15 +985,15 @@ export default {
     //  console.log("使用明细",params)
      getAutoDrugDetail(params).then(response=>{
        if(response.data.state == 1){
-        
+
         this.userList = response.data.data.list
         console.log("自动出库数据",this.userList)
         if(val.is_sys == 1){
-        
+
           this.drugDialogVisible = true
         }
         if(val.is_sys == 0){
-         
+
           this.drugDialogVisibleTwo = true
         }
          var userListOne = response.data.data.outList
@@ -1019,7 +1019,7 @@ export default {
           start_time:this.start_time,
           end_time:this.end_time,
          }
-       
+
         getDrugCountList(params).then(response=>{
           if(response.data.state == 1){
             var countlist =  response.data.data.countList
@@ -1045,7 +1045,7 @@ export default {
           }
         })
       },
-    
+
       getCount(drug_id,min_number,max_unit,min_unit){
         var count= 0
         var str = ""
@@ -1082,12 +1082,12 @@ export default {
               min_str =  total%min_number + min_unit
             }
          }
-        
+
         if (total < min_number){
             str = ""
             min_str = total + min_unit
         }
-       
+
          return str + min_str
       },
       getTotalCountOne(id,min_number,max_unit,min_unit){
@@ -1112,7 +1112,7 @@ export default {
             min_str =  total%min_number + min_unit
           }
         }
-        return str + min_str 
+        return str + min_str
       },
 
       getAllPrice(drug_id,price,min_price){
@@ -1131,9 +1131,9 @@ export default {
             }
            }
          }
-         strprice = str * price 
-         minstrprice = min_str * min_price 
-       
+         strprice = str * price
+         minstrprice = min_str * min_price
+
          total_price = strprice + minstrprice
          return  total_price
       },
@@ -1149,7 +1149,7 @@ export default {
         }
         return arr.join(",")
       },
-    
+
       getExportOutOrderDrugList(){
 
          var params = {
@@ -1194,9 +1194,9 @@ export default {
                 this.exportList[i].dealer = this.dealerList[z].dealer_name
             }
           }
-         
+
         }
-      
+
        import('@/vendor/Export2Excel').then(excel => {
         for(let i=0;i<this.exportList.length;i++){
           for(let j=0;j<this.drugTypeList.length;j++){
@@ -1209,7 +1209,7 @@ export default {
         const filterVal = ['drug_name','drug_type','unit','batch_number', 'count','price','retail_price','total_price','manufacturer','product_date','expiry_date','dealer','number','remark']
 
         // console.log("table",this.exportList)
-         
+
         const data = this.formatJson(filterVal, this.exportList)
         excel.export_json_to_excel({
           header: tHeader,
@@ -1231,7 +1231,7 @@ export default {
           }
         }
         all_price = total * price
-      
+
         return  all_price
       },
   }

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -130,7 +130,7 @@
                   </el-select>
                 </div>
               </el-form-item>
-              
+
             </template>
           </el-table-column>
          <el-table-column width="120" align="center">
@@ -138,7 +138,7 @@
               <span>出货价<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
-            
+
               <el-form-item
                 :prop="'recordData.' + scope.$index + '.price'"
                 :rules="tableRules.price"
@@ -380,7 +380,7 @@
         this.propForm.goods = [];
 
         this.propForm.goodType = [];
-      }, 
+      },
       GetConfigInfo: function() {
         const loading = this.$loading({
           lock: true,
@@ -419,7 +419,7 @@
         return name;
       },
       specificationName: function(drug_id) {
-      
+
         let name = "";
         for (let i = 0; i < this.goodInfo.length; i++) {
           if (this.goodInfo[i].id == drug_id) {
@@ -432,7 +432,7 @@
         if(row.supply_cancel_out_id >0){
          this.$message.error("采购出库数据不能新增!")
          return
-        } 
+        }
         this.unitShow = false
         if(this.drug_show == true){
           this.$message.error("自动出库数据不能编辑")
@@ -458,7 +458,7 @@
          this.$message.error("采购出库数据不能删除!")
          return
         }
-       
+
         if(this.drug_show == true){
           this.$message.error("采购出库数据不能编辑")
           return
@@ -487,7 +487,7 @@
           }).catch(() => {
           })
         }
-      }, 
+      },
       // getTime(val, temp) {
       //   if (val != 0) {
       //     return uParseTime(val, temp)
@@ -555,7 +555,7 @@
 
       back() {
         this.$router.go(-1)
-      }, 
+      },
       submit() {
         this.$refs['tableForm'].validate((valid) => {
           if (valid) {
@@ -581,7 +581,7 @@
                     this.recordInfo.recordData[i].dealer = this.dealerList[z].id
                  }
                }
-               
+
                for(let y=0;y<this.numberList.length;y++){
                   if(this.recordInfo.recordData[i].batch_number == this.numberList[y].id){
                      this.recordInfo.recordData[i].batch_number = this.numberList[y].batch_number
@@ -603,7 +603,7 @@
               'stockOut': this.recordInfo.recordData
             }
             console.log("param23322323233222323",params)
-           
+
             editDrugWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
@@ -618,7 +618,7 @@
                 var min_unit =  response.data.data.min_unit
                 var max_unit =  response.data.data.max_unit
                 var str = drug_name + " " + dose + dose_unit + "*" + min_number + min_unit+"/"+max_unit
-               loading.close()  
+               loading.close()
               if(msg == 1){
                 this.$message.error(str + "库存不足,请入库")
                 loading.close()
@@ -634,7 +634,7 @@
             return false
           }
         })
-      }, 
+      },
       GetOrderDetail: function(order_id) {
         const params = {
           'id': order_id
@@ -644,7 +644,7 @@
             this.$message.error(response.data.msg)
             return false
           } else {
-            
+
 
             var manulist = response.data.data.manulist
             this.manufacturerList = manulist
@@ -658,13 +658,13 @@
               }else{
                 response.data.data.list[i].number = response.data.data.list[i].number
               }
-              
+
               if(response.data.data.list[i].manufacturer == "0" || response.data.data.list[i].manufacturer == 0){
                 response.data.data.list[i].manufacturer = ""
               }else{
                 response.data.data.list[i].manufacturer = response.data.data.list[i].drug.manufacturer
               }
-              
+
               response.data.data.list[i].price = response.data.data.list[i].price.toString()
               response.data.data.list[i].retail_price = response.data.data.list[i].price.toString()
               response.data.data.list[i].count = response.data.data.list[i].count.toString()
@@ -673,7 +673,7 @@
               }else{
                 response.data.data.list[i].dealer = response.data.data.list[i].dealer
               }
-             
+
               response.data.data.list[i].product_date = this.getTime(response.data.data.list[i].product_date,"{y}-{h}-{d}")
               response.data.data.list[i].expiry_date = this.getTime(response.data.data.list[i].expiry_date,"{y}-{h}-{d}")
               this.recordInfo.recordData.push(response.data.data.list[i])
@@ -693,7 +693,7 @@
 
             this.warehouseOut = response.data.data.info
             this.warehouse_out_time = this.getTime(this.warehouseOut.warehouse_out_time, '{y}-{m}-{d}')
-          
+
 
           }
 
@@ -729,22 +729,22 @@
         postSearchDrugList(key).then(response => {
           if (response.data.state == 1) {
             searchArray = response.data.data.list;
-            
+
              var list = response.data.data.list
-            
+
 
              this.drugList = list
              var manufacturerList = response.data.data.manufacturerList
              this.manufacturerList = manufacturerList
              for(let i=0;i<this.drugList.length;i++){
-             
+
                 for(let j=0;j<this.manufacturerList.length;j++){
                   if(this.drugList[i].manufacturer == this.manufacturerList[j].id){
                      this.drugList[i].manufacturer = this.manufacturerList[j].manufacturer_name
                   }
                 }
              }
-           
+
              cb(this.drugList)
           } else {
             cb([])
@@ -784,7 +784,7 @@
              }
            }
         }
- 
+
       },
       getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
@@ -799,14 +799,14 @@
         getDrugBatchNumber(params).then(response=>{
            if(response.data.state == 1){
              var list = response.data.data.list
-           
+
              this.numberList = list
            }
         })
       }
     },
     created() {
-      this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
+      this.drugTypeList = getDictionaryDataConfig('system','drug_type')
       this.GetConfigInfo()
       this.propForm.goodUnit = this.$store.getters.good_unit
       const order_id = this.$route.query.id

src/xt_pages/supply/components/addGoodOrder.vue

@@ -16,7 +16,7 @@
           <span style="color: red">*</span><span>供应商:</span>
           <el-select
             v-model="supplier_name"
-            style="width: 140px; margin-right: 10px"
+            style="width: 220px; margin-right: 10px"
             placeholder="请选择"
             :disabled="disabled"
           >
@@ -76,7 +76,6 @@
           <el-button size="small" type="primary" @click="checkGoodOrder" v-if="is_check == 2" >审核</el-button>
           <el-button size="small" type="primary" @click="MofyGoodOrder" v-if="is_check == 1">反审核</el-button>
           <el-button size="small" type="primary" @click="toClick" v-if="is_check == 1" >生成采购退货单</el-button>
-          <el-button size="small" type="primary" @click="toPrint" v-show="showSix" >打印</el-button>
         </div>
       </div>
 
@@ -396,6 +395,13 @@
           >
           </el-input>
         </div>
+         <!-- 审核水印 -->
+        <img
+          src="@/assets/purchase/Reviewed.png"
+          alt="正在加载..."
+          class="reviewImg"
+          v-show="Reviewed == true"
+        />
       </el-form>
       <div>
         <div style="margin-top: 10px">合计:{{ getAllPrice() }} 元</div>
@@ -484,6 +490,7 @@ export default {
   },
   data() {
     return {
+      Reviewed: false,
       crumbs: [
         { path: false, name: "采购单" },
         { path: "/supply/good/order/query", name: "新增采购单" },
@@ -554,14 +561,14 @@ export default {
       warese_out_id: 0,
       return_remark: "",
       is_warehouse:0,
-      tableDataList:[],
-      showSix:false,
+      tableDataList:[]
     };
   },
    watch: {
     total_price: function (newval, oldval) {
       if(this.rate_of_concession != ""){
         this.addressChange()
+        this.count_payment()
       }
     }
   },
@@ -706,7 +713,7 @@ export default {
           this.recordInfo.tableList[i].supply_type = val.supply_type;
           this.recordInfo.tableList[i].supply_specification_name = val.supply_specification_name;
           this.recordInfo.tableList[i].supply_total = val.supply_total;
-          this.recordInfo.tableList[i].min_price = val.min_price  
+          this.recordInfo.tableList[i].min_price = val.min_price
           if (val.supply_count == NaN) {
             this.recordInfo.tableList[i].supply_count = "";
           } else {
@@ -792,9 +799,9 @@ export default {
           min_str = (total % min_number) + min_unit;
         }
       }
-     
+
       return max_str + min_str;
-    
+
     },
     getTotalStockCount(arr) {
       var total_count = 0;
@@ -806,7 +813,7 @@ export default {
       }else{
         return ""
       }
-     
+
     },
 
     calculate: function (val) {
@@ -845,13 +852,15 @@ export default {
         ).toFixed(2);
       }
       this.discount_amount = discount_amount;
-     
+      if(this.payment > 0) this.count_payment()
+
     },
     count_discount() {
       this.rate_of_concession = (
         this.discount_amount /
         (this.total_price * 0.01)
       ).toFixed(2);
+      if(this.payment > 0) this.count_payment()
     },
     count_payment() {
       let arrearage_1 = (this.total_price - this.discount_amount - this.payment).toFixed(2);
@@ -947,7 +956,7 @@ export default {
           this.tableDataList = []
           this.tableDataList = orderInfo
           console.log("changed23323232233232",this.tableDataList)
-         
+
         }
       });
     },
@@ -1003,7 +1012,7 @@ export default {
               this.number = ""
              }
           }
-          
+
           var params = {
             stockIn: this.recordInfo.tableList,
             return_remake: this.return_remark,
@@ -1015,7 +1024,6 @@ export default {
               this.$message.success("保存成功!");
               this.showOne = false;
               this.showTwo = true;
-              this.showSix = true
               var orderInfo = response.data.data.list;
               var warehouseOut = response.data.data.warehouseOut;
               this.is_check = 2
@@ -1153,6 +1161,7 @@ export default {
       getGoodOrderCountList(id, warehousing_id).then((response) => {
         if (response.data.state == 1) {
           this.$message.success("审核成功!");
+          this.Reviewed = true;
           this.disabled = true
           this.is_check = 1
           this.showOne = false;
@@ -1162,7 +1171,7 @@ export default {
           var purcaseOrder = response.data.data.purcaseOrder;
           var goodOrder = response.data.data.goodOrder;
           var drugList = response.data.data.drugList;
-     
+
           var is_warehouse = 0;
           for (let i = 0; i < purcaseOrder.length; i++) {
             for (let j = 0; j < drugList.length; j++) {
@@ -1277,7 +1286,7 @@ export default {
             this.is_check = 2
             this.disabled = false
             this.Reviewed = false
-           
+
           }
           if (msg == 2) {
             var cancelList = response.data.data.cancelList
@@ -1365,13 +1374,13 @@ export default {
                   }
                 }
               }
-            
+
               console.log("arr233232233232",arr)
              if (arr.length == 0) {
                 //未入库
                 var is_warehouse = 2;
                 this.ModefySupplyWarehousing(is_warehouse, this.id);
-                
+
               }
               if (arr.length > 0) {
                 //部分入库
@@ -1442,7 +1451,7 @@ export default {
                }
             }
 
-          
+
 
             let objInfo = {};
             if(cancelOrderList.length >0){
@@ -1457,7 +1466,7 @@ export default {
                 }
               });
               let newArr = Object.values(objInfo)
-            
+
               for (let i = 0; i < cancelOrderList.length; i++) {
                 for (let j = 0; j < newArr.length; j++) {
                   if (cancelOrderList[i].project_id == newArr[j].project_id) {
@@ -1545,9 +1554,32 @@ export default {
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
+.reviewImg {
+  position: fixed;
+  left: 50%;
+  transform: translateX(-50%);
+  top: 30%;
+}
+
+/deep/ .el-table--scrollable-x .el-table__body-wrapper {
+  overflow: auto;
+}
+/deep/ .gutter {
+  width: 15px !important;
+  display: inline-block !important;
+}
+/deep/ .el-table__fixed-right-patch {
+  width: 15px !important;
+}
+
+/deep/ .el-table__fixed-right {
+  bottom: 0 !important;
+  left: auto;
+  right: 0;
+}
 /deep/ .el-table__body-wrapper::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
+  width: 15px !important;
+  height: 15px !important;
 }
 .information {
   border: 1px #dcdfe6 solid;
@@ -1598,10 +1630,10 @@ export default {
 .el-table::before {
   background-color: #d0d3da;
 }
-.el-table__fixed-right {
+/* .el-table__fixed-right {
   width: 150px;
   bottom: 20px;
   height: 100%;
-}
+} */
 
 </style>

src/xt_pages/supply/components/addGoodReturn.vue

@@ -16,7 +16,7 @@
           <span style="color: red">*</span><span>供应商:</span>
           <el-select
             v-model="supplier_name"
-            style="width: 140px; margin-right: 10px"
+            style="width: 220px; margin-right: 10px"
             placeholder="请选择"
             :disabled="disabled"
           >
@@ -42,7 +42,7 @@
             value-format="yyyy-MM-dd"
             :disabled="disabled"
           ></el-date-picker>
-         
+
           <span>单据编码:{{ number }}</span>
         </div>
         <div>
@@ -68,7 +68,7 @@
             >打印</el-button
           >
           <el-button size="small" type="primary" v-if="is_check == 2" @click="checkReturnOrder">审核</el-button>
-          <el-button size="small" type="primary" v-if="is_check == 1" @click="modefyReturnOrder">反审核</el-button> 
+          <el-button size="small" type="primary" v-if="is_check == 1" @click="modefyReturnOrder">反审核</el-button>
         </div>
       </div>
 
@@ -398,7 +398,7 @@
         ></span>
       </div>
     </div>
-    
+
   </div>
 </template>
 
@@ -616,7 +616,7 @@ export default {
             for (let j = 0; j < goodList[i].unitList.length; j++) {
               goodList[i].unitList[0].name = goodList[i].packing_unit;
             }
-        
+
             goodList[i].sum_count = this.getTotalStockCountTwo(
               goodList[i].good_warehouse_info
             );
@@ -727,7 +727,7 @@ export default {
           total += parseInt(arr[i].stock_max_number+ arr[i].stock_min_number);
         }
       }
-    
+
       if (total < min_number) {
         min_str = total + min_unit;
       }
@@ -765,7 +765,7 @@ export default {
       }else{
         return ""
       }
-      
+
     },
     getTotalStockCountTwo(arr) {
       var total_count = 0;
@@ -773,7 +773,7 @@ export default {
         total_count += arr[i].stock_count;
       }
       return total_count
-    
+
     },
     calculate: function (val) {
       if (isNaN(val)) {
@@ -802,7 +802,7 @@ export default {
       }else{
         return ""
       }
-     
+
     },
     addressChange() {
       var discount_amount = 0;
@@ -813,7 +813,7 @@ export default {
         ).toFixed(2);
       }
       this.discount_amount = discount_amount;
-     
+
     },
     count_discount() {
       this.rate_of_concession = (
@@ -860,7 +860,7 @@ export default {
           this.supplier_name = out.supplier_id;
           this.rate_of_concession = out.rate_of_concession;
           this.discount_amount = out.discount_amount;
-      
+
           this.start_time = this.getTimes(out.document_date);
           var orderInfo = response.data.data.list;
           console.log("orderINFO233232232332", orderInfo);
@@ -883,7 +883,7 @@ export default {
             }
             orderInfo[i].id = orderInfo[i].id;
             orderInfo[i].supply_count = orderInfo[i].supply_count;
-            
+
             orderInfo[i].supply_price = orderInfo[i].price;
             orderInfo[i].supply_remake = orderInfo[i].remark;
             orderInfo[i].type = orderInfo[i].is_source;
@@ -898,7 +898,7 @@ export default {
             orderInfo[i].warehousing_id = orderInfo[i].warehousing_id
             orderInfo[i].warehouse_info_id = orderInfo[i].warehouse_info_id
             orderInfo[i].deposit_rate = ""
-           
+
             if (orderInfo[i].is_source == 1) {
               for (let j = 0; j < drugList.length; j++) {
                 if (orderInfo[i].project_id == drugList[j].id) {
@@ -925,7 +925,7 @@ export default {
                   orderInfo[i].max_unit =drugList[j].max_unit
                   orderInfo[i].min_unit =drugList[j].min_unit
                 }
-               
+
               }
               orderInfo[i].count = orderInfo[i].count + orderInfo[i].supply_unit
             }
@@ -962,8 +962,8 @@ export default {
       var warehouse_out_id = this.$route.query.id
       this.$refs["tableForm"].validate((valid)=>{
         if(valid){
-        
-        
+
+
           for(let i=0;i<this.recordInfo.tableList.length;i++){
             if(this.recordInfo.tableList[i].count == ""){
               this.$message.error(this.recordInfo.tableList[i].name+"无可退库数量,保存失败!")
@@ -990,7 +990,7 @@ export default {
               }
 
             }
-          } 
+          }
            //判断是否在采购单数据中做了删除,如果长度相等则代表没有删除，如果不等则代表做了删除或者新增
            if(this.recordInfo.tableList.length < this.tableDataList.length){
              warehouse_out_id = 0
@@ -1008,7 +1008,7 @@ export default {
             return_marke:this.return_remark,
            }
            console.log("2323323232",params)
-          
+
            saveGoodReturnOrder(params,warehouse_out_id,this.start_time,this.rate_of_concession,this.discount_amount,this.arrearage,this.payment,this.supplier_name).then(response=>{
              if(response.data.state == 1){
                 this.loading = false
@@ -1037,16 +1037,16 @@ export default {
                 }else{
                   this.payment = out.payment
                 }
-               
+
                 if(out.arrearage == 0){
                    this.arrearage = ""
                 }else{
                   this.arrearage = out.arrearage
                 }
-               
+
                 this.start_time = this.getTimes(out.document_date)
                 var orderInfo = response.data.data.list
-                
+
                 for(let i=0;i< orderInfo.length;i++){
                   orderInfo[i].name = orderInfo[i].name
                   orderInfo[i].id = orderInfo[i].id
@@ -1079,7 +1079,7 @@ export default {
                             orderInfo[i].unitList[0].name = this.drugList[j].max_unit
                            }
 
-                          
+
 
                         }
                      }
@@ -1098,7 +1098,7 @@ export default {
                 this.recordInfo.tableList = orderInfo
              }
            })
-          
+
         }
       })
     },
@@ -1112,8 +1112,8 @@ export default {
       var warehouse_out_id = this.id;
       this.$refs["tableForm"].validate((valid)=>{
         if(valid){
-         
-        
+
+
           for(let i=0;i<this.recordInfo.tableList.length;i++){
             if(this.recordInfo.tableList[i].count == ""){
               this.$message.error(this.recordInfo.tableList[i].name+"无可退库数量,保存失败!")
@@ -1160,7 +1160,7 @@ export default {
      console.log("审核2322323232323",params)
      checkReturnOrder(params).then(response=>{
        if(response.data.state == 1){
-      
+
         var msg = response.data.data.msg
         if(msg == 1){
           this.loading = false
@@ -1188,7 +1188,7 @@ export default {
               var str = drug_name + " " + dose + dose_unit + "*" + min_number + min_unit+"/"+max_unit
               this.$message.error(str + "库存不足,审核失败!")
           }
-       
+
        }
      })
     },
@@ -1212,7 +1212,7 @@ export default {
     getSupplyCount(supply_count,sum_count,supply_unit,type,min_number,max_unit,min_unit,index){
      console.log("val23322323",supply_count,sum_count,supply_unit,type,min_number,max_unit,min_unit)
       var total_count = 0
-      
+
       if(type == 1){
        if(supply_unit == max_unit){
           total_count = supply_count * min_number
@@ -1237,7 +1237,7 @@ export default {
           }
          }
       }
-       
+
       if(type == 2){
          if(supply_count > sum_count){
           this.$message.error("数量不能大于可退数量!")
@@ -1254,7 +1254,7 @@ export default {
           }
          }
       }
-    
+
     },
     toPrint() {
       this.$router.push({ path: "/good/return/print?&id=" + this.id });
@@ -1293,7 +1293,7 @@ export default {
     tempObj["max_unit"] = ""
     tempObj["min_unit"] = ""
     this.recordInfo.tableList.push(tempObj);
-   
+
     this.getInitOrder();
     if(parseInt(this.$route.query.id) > 0){
 
@@ -1306,6 +1306,13 @@ export default {
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
+
+.reviewImg {
+  position: fixed;
+  left: 50%;
+  transform: translateX(-50%);
+  top: 30%;
+}
 .information {
   border: 1px #dcdfe6 solid;
   padding: 30px 20px 30px 20px;
@@ -1331,9 +1338,25 @@ export default {
   margin-bottom: 15px;
 }
 
+/deep/ .el-table--scrollable-x .el-table__body-wrapper {
+  overflow: auto;
+}
+/deep/ .gutter {
+  width: 15px !important;
+  display: inline-block !important;
+}
+/deep/ .el-table__fixed-right-patch {
+  width: 15px !important;
+}
+
+/deep/ .el-table__fixed-right {
+  bottom: 0 !important;
+  left: auto;
+  right: 0;
+}
 /deep/ .el-table__body-wrapper::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
+  width: 15px !important;
+  height: 15px !important;
 }
 </style>
 
@@ -1360,9 +1383,11 @@ export default {
 .el-table::before {
   background-color: #d0d3da;
 }
-.el-table__fixed-right {
+/* .el-table__fixed-right {
   width: 150px;
   bottom: 20px;
   height: 100%;
 }
+ */
+
 </style>

src/xt_pages/supply/components/addPurchaseOrder.vue

@@ -16,7 +16,7 @@
           <span style="color: red">*</span><span>供应商:</span>
           <el-select
             v-model="supplier_name"
-            style="width: 140px; margin-right: 10px"
+            style="width: 220px; margin-right: 10px"
             placeholder="请选择"
           >
             <el-option
@@ -76,7 +76,7 @@
             @click="checkPurchaseOrder"
             v-show="showOne">审核
          </el-button>
-        
+
         <el-button
             size="small"
             type="primary"
@@ -89,7 +89,7 @@
             @click="checkReturnOrder"
             v-if="is_check == 1">反审核
          </el-button>
-         
+
           <el-button
             size="small"
             type="primary"
@@ -449,15 +449,6 @@ export default {
       is_check: 2,
     };
   },
-
-  watch: {
-    total_price: function (newval, oldval) {
-      if(this.rate_of_concession != ""){
-        this.addressChange()
-      }
-    }
-  },
-
   methods: {
     getInitOrder() {
       getInitOrder().then((response) => {
@@ -807,12 +798,7 @@ export default {
       for (let i = 0; i < arr.length; i++) {
         total_count += arr[i].stock_count;
       }
-      if(total_count > 0){
-        return total_count;
-      }else{
-        return ""
-      }
-    
+      return total_count;
     },
     calculate: function (val) {
       if (isNaN(val)) {
@@ -888,7 +874,17 @@ export default {
         }
       });
     },
-  
+    getAllPrice() {
+      var total_price = 0;
+      for (let i = 0; i < this.recordInfo.tableList.length; i++) {
+        total_price +=
+          this.recordInfo.tableList[i].supply_price *
+          this.recordInfo.tableList[i].supply_count;
+      }
+      this.total_price = total_price;
+      this.discount_amount = (this.total_price * this.rate_of_concession * 0.01).toFixed(2);
+      return total_price.toFixed(2);
+    },
     count_discount() {
       this.rate_of_concession = (
         this.discount_amount /
@@ -924,19 +920,7 @@ export default {
     getDataConfig(module, filed_name) {
       return getDataConfig(module, filed_name);
     },
-
-     getAllPrice() {
-      var total_price = 0;
-      for (let i = 0; i < this.recordInfo.tableList.length; i++) {
-        total_price +=
-          this.recordInfo.tableList[i].supply_price *
-          this.recordInfo.tableList[i].supply_count;
-      }
-      this.total_price = total_price;
-      // this.discount_amount = (this.total_price * this.rate_of_concession * 0.01).toFixed(2);
-      return total_price.toFixed(2);
-    },
-     addressChange() {
+    addressChange() {
       var discount_amount = 0;
       if (this.rate_of_concession > 0) {
         discount_amount = (
@@ -945,7 +929,6 @@ export default {
         ).toFixed(2);
       }
       this.discount_amount = discount_amount;
-     
     },
     checkReturnOrder() {
       var id = this.id;
@@ -955,7 +938,6 @@ export default {
           this.disabled = false;
           this.showOne = true;
           this.is_check = 2;
-          this.Reviewed = false
           this.$message.success("反审核成功!");
         }
       });
@@ -971,9 +953,9 @@ export default {
           var purcaseOrder = response.data.data.purcaseOrder;
 
           var goodOrder = response.data.data.goodOrder;
-         
+
           var drugList = response.data.data.drugList;
-      
+
           var ids = "";
           // 如果采购单没有数据，则代表改订单第一次生成采购订单数据
           if (goodOrder.length == 0) {
@@ -1020,7 +1002,7 @@ export default {
                 }
               }
             }
-     
+
 
             for (let i = 0; i < newArr.length; i++) {
               for (let j = 0; j < newArr[i].child.length; j++) {
@@ -1081,7 +1063,7 @@ export default {
               }
             }
            }
-     
+
           }
         }
       });
@@ -1178,4 +1160,4 @@ export default {
   bottom: 20px;
   height: 100%;
 }
-</style>
+</style>

src/xt_pages/supply/components/addSupply.vue

@@ -1,5 +1,10 @@
 <template>
-  <el-dialog :title="title" :visible.sync="dialogVisible" width="40%" :before-close="closePop" >
+  <el-dialog
+    :title="title"
+    :visible.sync="dialogVisible"
+    width="40%"
+    :before-close="closePop"
+  >
     <!-- :before-close="handleClose" 如需要可添加进上方 -->
     <div>
       <el-form
@@ -32,10 +37,7 @@
                 @select="handleSelect"
               ></el-autocomplete> -->
 
-              <el-select
-                v-model="supplier.supplierType"
-                @select="handleSelect"
-              >
+              <el-select v-model="supplier.supplierType" @select="handleSelect">
                 <el-option
                   v-for="item in supplierType"
                   :key="item.name"
@@ -51,7 +53,8 @@
               <el-input
                 v-model="supplier.vatRate"
                 @keyup.native="supplier.vatRate = oninput(supplier.vatRate)"
-              ></el-input>%
+              ></el-input
+              >%
             </el-form-item>
           </el-col>
         </el-row>
@@ -318,9 +321,9 @@ export default {
         this.title = "编辑供应商";
         this.supplier.supplierCode = data.SupplierCode;
         this.supplier.supplierName = data.SupplierName;
-        if (data.SupplierType == 0){
-          this.supplier.supplierType = ""
-        }else {
+        if (data.SupplierType == 0) {
+          this.supplier.supplierType = "";
+        } else {
           this.supplier.supplierType = data.SupplierType;
         }
         this.supplier.vatRate = data.VatRate;
@@ -432,7 +435,7 @@ export default {
                     this.closePop();
                     this.$emit("init");
                   } else {
-                    this.$message.error("新增失败："+res.data.msg);
+                    this.$message.error("新增失败：" + res.data.msg);
                     setTimeout(() => {
                       this.closePop();
                     }, 2000);
@@ -480,7 +483,7 @@ export default {
                     this.closePop();
                     this.$emit("init");
                   } else {
-                    this.$message.error("修改失败："+res.data.msg);
+                    this.$message.error("修改失败：" + res.data.msg);
                     setTimeout(() => {
                       this.closePop();
                     }, 2000);
@@ -565,9 +568,9 @@ export default {
       let params = {
         id: data.id,
       };
-      if (params.id==undefined||params.id=="undefined") {
+      if (params.id == undefined || params.id == "undefined") {
         this.recordInfo.contacts.splice(index, 1);
-      }else {
+      } else {
         if (this.show_type == 1) {
           if (this.recordInfo.contacts.length <= 1) {
             return;
@@ -577,7 +580,7 @@ export default {
         } else if (this.show_type == 2) {
           delcontactone(params).then((res) => {
             if (res.data.state == 1) {
-              this.$message.success("删除成功!!:",index);
+              this.$message.success("删除成功!!:", index);
               this.getcontacts(this.supplier_ids);
             } else {
               this.$message.error(res.data.data.list);
@@ -661,12 +664,26 @@ export default {
 /deep/ .el-form-item__error {
   // display: none !important;
 }
-/deep/ .el-table__body-wrapper::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
+// /deep/ .el-table__body-wrapper::-webkit-scrollbar {
+//   width: 10px;
+//   height: 10px;
+// }
+
+
+/deep/ .el-table--scrollable-x .el-table__body-wrapper {
+  overflow: auto;
+}
+/deep/ .gutter {
+  width: 22px !important;
+  display: inline-block !important;
+}
+/deep/ .el-table__fixed-right-patch {
+  width: 22px !important;
 }
 
-/deep/ .el-table__fixed-right{
+/deep/ .el-table__fixed-right {
   bottom: 0 !important;
+  left: auto;
+  right: 22px;
 }
 </style>

src/xt_pages/supply/components/editGoodOrder.vue

@@ -17,7 +17,7 @@
           <!-- <div>供应商:</div> -->
           <el-select
             v-model="supplier_name"
-            style="width: 140px; margin-right: 10px"
+            style="width: 220px; margin-right: 10px"
             placeholder="请选择"
             :disabled="disabled"
           >
@@ -565,11 +565,13 @@ export default {
       tableDataList: [],
     };
   },
-
-  watch() {
-    // total_price:function(newval,oldval){
-    //   console.log(newval,'op')
-    // }
+   watch: {
+    total_price: function (newval, oldval) {
+      if(this.rate_of_concession != ""){
+        this.addressChange()
+        this.count_payment()
+      }
+    }
   },
 
   methods: {
@@ -898,12 +900,14 @@ export default {
         ).toFixed(2);
       }
       this.discount_amount = discount_amount;
+      if(this.payment > 0) this.count_payment()
     },
     count_discount() {
       this.rate_of_concession = (
         this.discount_amount /
         (this.total_price * 0.01)
       ).toFixed(2);
+      if(this.payment > 0) this.count_payment()
     },
     count_payment() {
       let arrearage_1 = (
@@ -1577,9 +1581,25 @@ export default {
   margin-top: 15px;
   margin-bottom: 15px;
 }
+/deep/ .el-table--scrollable-x .el-table__body-wrapper {
+  overflow: auto;
+}
+/deep/ .gutter {
+  width: 15px !important;
+  display: inline-block !important;
+}
+/deep/ .el-table__fixed-right-patch {
+  width: 15px !important;
+}
+
+/deep/ .el-table__fixed-right {
+  bottom: 0 !important;
+  left: auto;
+  right: 0;
+}
 /deep/ .el-table__body-wrapper::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
+  width: 15px !important;
+  height: 15px !important;
 }
 </style>
 
@@ -1606,11 +1626,11 @@ export default {
 .el-table::before {
   background-color: #d0d3da;
 }
-.el-table__fixed-right {
+/* .el-table__fixed-right {
   width: 150px;
   bottom: 20px;
   height: 100%;
-}
+} */
 .reviewImg {
   position: fixed;
   left: 50%;

src/xt_pages/supply/components/editGoodReturn.vue

@@ -16,7 +16,7 @@
           <span style="color: red">*</span><span>供应商:</span>
           <el-select
             v-model="supplier_name"
-            style="width: 140px; margin-right: 10px"
+            style="width: 220px; margin-right: 10px"
             placeholder="请选择"
             :disabled ="disabled"
           >
@@ -1342,9 +1342,25 @@ export default {
   margin-bottom: 15px;
 }
 
+/deep/ .el-table--scrollable-x .el-table__body-wrapper {
+  overflow: auto;
+}
+/deep/ .gutter {
+  width: 15px !important;
+  display: inline-block !important;
+}
+/deep/ .el-table__fixed-right-patch {
+  width: 15px !important;
+}
+
+/deep/ .el-table__fixed-right {
+  bottom: 0 !important;
+  left: auto;
+  right: 0;
+}
 /deep/ .el-table__body-wrapper::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
+  width: 15px !important;
+  height: 15px !important;
 }
 </style>
 
@@ -1371,11 +1387,11 @@ export default {
 .el-table::before {
   background-color: #d0d3da;
 }
-.el-table__fixed-right {
+/* .el-table__fixed-right {
   width: 150px;
   bottom: 20px;
   height: 100%;
-}
+} */
 .reviewImg {
   position: fixed;
   left: 50%;

src/xt_pages/supply/components/editPurchaseOrder.vue

@@ -12,11 +12,11 @@
           align-items: center;
         "
       >
-        <div style="display:flex;align-items: center;">
+        <div style="display: flex; align-items: center">
           <span style="color: red">*</span><span>供应商:</span>
           <el-select
             v-model="supplier_name"
-            style="width: 140px; margin-right: 10px"
+            style="width: 220px; margin-right: 10px"
             placeholder="请选择"
             @change="changeTypeName"
             :disabled="disabled"
@@ -60,7 +60,7 @@
           ></el-date-picker>
           <span>单据编码:{{ number }}</span>
         </div>
-        <div style="display: flex;">
+        <div style="display: flex">
           <el-button size="small" type="primary" @click="toAdd" v-show="showOne"
             >生成采购单</el-button
           >
@@ -348,6 +348,7 @@
             v-model="discount_amount"
             :disabled="disabled"
             placeholder="请输入优惠金额"
+            @input="count_discount"
           ></el-input
         ></span>
       </div>
@@ -367,12 +368,20 @@
     <el-button @click="dialogVisible = false">取 消</el-button>
   </span>
   </el-dialog> -->
-  <popup ref="Popup" :content="content" :content_1="content_1" :content_2="content_2" :number="number" :orderList ="orderList" :type="type"></popup>
+    <popup
+      ref="Popup"
+      :content="content"
+      :content_1="content_1"
+      :content_2="content_2"
+      :number="number"
+      :orderList="orderList"
+      :type="type"
+    ></popup>
   </div>
 </template>
 
 <script>
-import popup from "./Popup"
+import popup from "./Popup";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import { uParseTime } from "@/utils/tools";
 import {
@@ -384,20 +393,20 @@ import {
   getGoodOrderList,
   getReturnOrder,
   deletePurchaseOrder,
-  deletePurchOder
+  deletePurchOder,
 } from "@/api/supply";
 export default {
   name: "addPurchaseOrder",
   components: {
     BreadCrumb,
-    popup
+    popup,
   },
   data() {
     return {
-      content_2:"采购单",
-      content:"采购订单",
-      content_1:"已有以下关联数据,不能反审核",
-      type:1,
+      content_2: "采购单",
+      content: "采购订单",
+      content_1: "已有以下关联数据,不能反审核",
+      type: 1,
       Reviewed: false,
       crumbs: [
         { path: false, name: "采购订单" },
@@ -454,9 +463,16 @@ export default {
       showThree: false,
       orderList: [],
       return_remark: "",
-      
     };
   },
+
+  watch: {
+    total_price: function (newval, oldval) {
+      if (this.rate_of_concession != "") {
+        this.addressChange();
+      }
+    },
+  },
   methods: {
     getInitOrder() {
       getInitOrder().then((response) => {
@@ -559,15 +575,23 @@ export default {
                 goodList[i].good_type_id = this.goodTypeList[y].type_name;
               }
             }
-            goodList[i].supply_name =goodList[i].good_name +" " +goodList[i].specification_name +" " + goodList[i].manufacturer;
+            goodList[i].supply_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_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_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].number
+            goodList[i].supply_license_number = goodList[i].number;
             goodList[i].supply_remake = "";
             goodList[i].type = 2;
             goodList[i].name = goodList[i].good_name;
@@ -579,7 +603,6 @@ export default {
             this.tabList.push(goodList[i]);
           }
           this.goodList = goodList;
-          
         }
       });
     },
@@ -594,7 +617,8 @@ export default {
           this.recordInfo.tableList[i].name = val.name;
           this.recordInfo.tableList[i].supply_name = val.supply_name;
           this.recordInfo.tableList[i].supply_type = val.supply_type;
-          this.recordInfo.tableList[i].supply_specification_name =val.supply_specification_name;
+          this.recordInfo.tableList[i].supply_specification_name =
+            val.supply_specification_name;
           this.recordInfo.tableList[i].supply_total = val.supply_total;
           if (val.supply_count == NaN) {
             this.recordInfo.tableList[i].supply_count = "";
@@ -604,10 +628,15 @@ export default {
               : "";
           }
 
-          this.recordInfo.tableList[i].supply_price = val.supply_price? val.supply_price: "";
-          this.recordInfo.tableList[i].supply_total_price =val.supply_total_price ? val.supply_total_price : "";
-          this.recordInfo.tableList[i].supply_manufacturer =val.supply_manufacturer;
-          this.recordInfo.tableList[i].supply_license_number =val.supply_license_number;
+          this.recordInfo.tableList[i].supply_price = val.supply_price
+            ? val.supply_price
+            : "";
+          this.recordInfo.tableList[i].supply_total_price =
+            val.supply_total_price ? val.supply_total_price : "";
+          this.recordInfo.tableList[i].supply_manufacturer =
+            val.supply_manufacturer;
+          this.recordInfo.tableList[i].supply_license_number =
+            val.supply_license_number;
           this.recordInfo.tableList[i].supply_remake = val.supply_remake;
           this.recordInfo.tableList[i].is_total = val.is_total;
           this.recordInfo.tableList[i].supply_unit = val.supply_unit;
@@ -641,42 +670,40 @@ export default {
       this.recordInfo.tableList.push(tempObj);
     },
     handleDelete: function (index, row) {
-      
-      if(this.is_check == 1){
-         this.$message.error("已审核单据，不能删除!")
-         return false
+      if (this.is_check == 1) {
+        this.$message.error("已审核单据，不能删除!");
+        return false;
       }
-      if(row.id == 0){
+      if (row.id == 0) {
         if (this.recordInfo.tableList.length <= 1) {
           this.$message.error("只有一条记录的时候无法删除");
           return;
         } else {
           this.recordInfo.tableList.splice(index, 1);
         }
-      }else{
-          const params = {
-            id: row.id
-          }
-          this.$confirm('确认删除吗?', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            deletePurchOder(params).then(response => {
+      } else {
+        const params = {
+          id: row.id,
+        };
+        this.$confirm("确认删除吗?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            deletePurchOder(params).then((response) => {
               if (response.data.state == 0) {
-                this.$message.error(response.data.msg)
-                return false
+                this.$message.error(response.data.msg);
+                return false;
               } else {
-                this.$message.success('删除成功')
+                this.$message.success("删除成功");
 
-                this.recordInfo.tableList.splice(index, 1)
+                this.recordInfo.tableList.splice(index, 1);
               }
-            })
-          }).catch(() => {
-        })
-        
+            });
+          })
+          .catch(() => {});
       }
-      
     },
 
     changeTypeName() {},
@@ -715,12 +742,11 @@ export default {
       for (let i = 0; i < arr.length; i++) {
         total_count += arr[i].stock_count;
       }
-      if(total_count >0){
+      if (total_count > 0) {
         return total_count;
-      }else{
-        return ""
+      } else {
+        return "";
       }
-     
     },
     calculate: function (val) {
       if (isNaN(val)) {
@@ -746,13 +772,21 @@ export default {
       this.$refs["tableForm"].validate((valid) => {
         if (valid) {
           this.loading = true;
-         
+
           for (let i = 0; i < this.recordInfo.tableList.length; i++) {
-            this.recordInfo.tableList[i].supply_count = parseInt(this.recordInfo.tableList[i].supply_count);
-            this.recordInfo.tableList[i].supply_license_number =this.recordInfo.tableList[i].supply_license_number.toString();
-            this.recordInfo.tableList[i].supply_total_price = (this.recordInfo.tableList[i].supply_count *this.recordInfo.tableList[i].supply_price).toString();
-            this.recordInfo.tableList[i].supply_total =this.recordInfo.tableList[i].supply_total.toString();
-            this.recordInfo.tableList[i].supply_price = this.recordInfo.tableList[i].supply_price.toString();
+            this.recordInfo.tableList[i].supply_count = parseInt(
+              this.recordInfo.tableList[i].supply_count
+            );
+            this.recordInfo.tableList[i].supply_license_number =
+              this.recordInfo.tableList[i].supply_license_number.toString();
+            this.recordInfo.tableList[i].supply_total_price = (
+              this.recordInfo.tableList[i].supply_count *
+              this.recordInfo.tableList[i].supply_price
+            ).toString();
+            this.recordInfo.tableList[i].supply_total =
+              this.recordInfo.tableList[i].supply_total.toString();
+            this.recordInfo.tableList[i].supply_price =
+              this.recordInfo.tableList[i].supply_price.toString();
             for (let j = 0; j < this.manufactuerList.length; j++) {
               if (
                 this.recordInfo.tableList[i].supply_manufacturer ==
@@ -776,8 +810,8 @@ export default {
             stockIn: this.recordInfo.tableList,
             return_remake: this.return_remark,
           };
-          console.log("哈哈哈哈哈哈",params)
-          
+          console.log("哈哈哈哈哈哈", params);
+
           updatePurchaseOrder(
             params,
             this.supplier_name,
@@ -792,7 +826,7 @@ export default {
               this.loading = false;
               var warehousingInfo = response.data.data.warehousingInfo;
               this.$message.success("保存成功!");
-              this.getPurchaseOrderDetail()
+              this.getPurchaseOrderDetail();
             }
           });
         }
@@ -807,7 +841,7 @@ export default {
           this.recordInfo.tableList[i].supply_count;
       }
       this.total_price = total_price;
-      this.addressChange()
+      // this.discount_amount = (this.total_price * this.rate_of_concession * 0.01).toFixed(2);
       return total_price.toFixed(2);
     },
 
@@ -816,7 +850,8 @@ export default {
         confirmButtonText: "确 定",
         cancelButtonText: "取 消",
         type: "warning",
-      }).then(() => {
+      })
+        .then(() => {
           checkPurchaseOrder(this.id).then((response) => {
             if (response.data.state == 1) {
               var info = response.data.data.info;
@@ -872,11 +907,11 @@ export default {
             this.showTwo = false;
             this.showThree = true;
           }
-         
+
           var drugList = response.data.data.baseList;
           var goodList = response.data.data.goodList;
           for (let i = 0; i < orderInfo.length; i++) {
-            orderInfo[i].id = orderInfo[i].id
+            orderInfo[i].id = orderInfo[i].id;
             orderInfo[i].supply_count = orderInfo[i].count;
             orderInfo[i].supply_price = orderInfo[i].price;
             orderInfo[i].supply_remake = orderInfo[i].remark;
@@ -910,32 +945,31 @@ export default {
               }
             }
           }
-         
+
           this.recordInfo.tableList = [];
-          if(orderInfo.length == 0){
-              const tempObj = {};
-              tempObj["id"] = 0;
-              tempObj["name"] = "";
-              tempObj["supply_name"] = "";
-              tempObj["supply_type"] = "";
-              tempObj["supply_specification_name"] = "";
-              tempObj["supply_total"] = "";
-              tempObj["supply_count"] = "";
-              tempObj["supply_price"] = "";
-              tempObj["supply_total_price"] = "";
-              tempObj["supply_manufacturer"] = "";
-              tempObj["supply_license_number"] = "";
-              tempObj["supply_remake"] = "";
-              tempObj["type"] = 0;
-              tempObj["is_total"] = 1;
-              tempObj["project_id"] = 0;
-              tempObj["supply_unit"] = "";
-              tempObj["manufacturer_id"] = "";
-              this.recordInfo.tableList.push(tempObj);
-          }else{
+          if (orderInfo.length == 0) {
+            const tempObj = {};
+            tempObj["id"] = 0;
+            tempObj["name"] = "";
+            tempObj["supply_name"] = "";
+            tempObj["supply_type"] = "";
+            tempObj["supply_specification_name"] = "";
+            tempObj["supply_total"] = "";
+            tempObj["supply_count"] = "";
+            tempObj["supply_price"] = "";
+            tempObj["supply_total_price"] = "";
+            tempObj["supply_manufacturer"] = "";
+            tempObj["supply_license_number"] = "";
+            tempObj["supply_remake"] = "";
+            tempObj["type"] = 0;
+            tempObj["is_total"] = 1;
+            tempObj["project_id"] = 0;
+            tempObj["supply_unit"] = "";
+            tempObj["manufacturer_id"] = "";
+            this.recordInfo.tableList.push(tempObj);
+          } else {
             this.recordInfo.tableList = orderInfo;
           }
-         
         }
       });
     },
@@ -955,21 +989,23 @@ export default {
           var purcaseOrder = response.data.data.purcaseOrder;
 
           var goodOrder = response.data.data.goodOrder;
-         
+
           var drugList = response.data.data.drugList;
-      
+
           var ids = "";
           // 如果采购单没有数据，则代表改订单第一次生成采购订单数据
           if (goodOrder.length == 0) {
-            this.$router.push({path: "/good/order/add?id=" + id + "&ids=" + ids});
+            this.$router.push({
+              path: "/good/order/add?id=" + id + "&ids=" + ids,
+            });
           }
-       
-          
+
           for (let i = 0; i < purcaseOrder.length; i++) {
             for (let j = 0; j < drugList.length; j++) {
               if (purcaseOrder[i].is_source == 1) {
                 if (purcaseOrder[i].supply_unit == drugList[j].max_unit) {
-                  purcaseOrder[i].count = purcaseOrder[i].count * drugList[j].min_number;
+                  purcaseOrder[i].count =
+                    purcaseOrder[i].count * drugList[j].min_number;
                 }
               }
             }
@@ -979,7 +1015,8 @@ export default {
             for (let j = 0; j < drugList.length; j++) {
               if (goodOrder[i].is_source == 1) {
                 if (goodOrder[i].supply_unit == drugList[j].max_unit) {
-                    goodOrder[i].count = goodOrder[i].count * drugList[j].min_number;
+                  goodOrder[i].count =
+                    goodOrder[i].count * drugList[j].min_number;
                 }
               }
             }
@@ -1006,7 +1043,6 @@ export default {
                 }
               }
             }
-     
 
             for (let i = 0; i < newArr.length; i++) {
               for (let j = 0; j < newArr[i].child.length; j++) {
@@ -1014,95 +1050,104 @@ export default {
               }
             }
 
-            var arr = []; 
+            var arr = [];
             var total = 0;
             var str = "";
-            console.log("newArr2323223323223",newArr)
-            console.log("newArr2323223323223",purcaseOrder)
-            
+            console.log("newArr2323223323223", newArr);
+            console.log("newArr2323223323223", purcaseOrder);
 
-           console.log("长度1",goodOrder.length)
-           console.log("长度2",purcaseOrder.length)
+            console.log("长度1", goodOrder.length);
+            console.log("长度2", purcaseOrder.length);
 
-          if(purcaseOrder.length <=goodOrder.length){
-            //如果采购单有数据，则需要比较数量
-            if (newArr.length > 0) {
-              for (let i = 0; i < purcaseOrder.length; i++) {
-                for (let j = 0; j < newArr.length; j++) {
-                  if (purcaseOrder[i].project_id == newArr[j].project_id) {
-                    //根据商品ID比较数量大小,把数量不足的商品ID储存,表示采购单的数量未满足采购订单的数据，可以继续生成采购单
-                    if (purcaseOrder[i].count > newArr[j].count) {
-                      arr.push(purcaseOrder[i].project_id);
+            if (purcaseOrder.length <= goodOrder.length) {
+              //如果采购单有数据，则需要比较数量
+              if (newArr.length > 0) {
+                for (let i = 0; i < purcaseOrder.length; i++) {
+                  for (let j = 0; j < newArr.length; j++) {
+                    if (purcaseOrder[i].project_id == newArr[j].project_id) {
+                      //根据商品ID比较数量大小,把数量不足的商品ID储存,表示采购单的数量未满足采购订单的数据，可以继续生成采购单
+                      if (purcaseOrder[i].count > newArr[j].count) {
+                        arr.push(purcaseOrder[i].project_id);
+                      }
                     }
                   }
                 }
-              }
-              //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成
-             
-              if (arr.length == 0) {
-                this.$message.error("该订单已全部生成采购单，请知悉!");
-                return;
-              }
+                //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成
 
-              if (arr.length >0) {
-                str = arr.join(",");
-                this.$router.push({path: "/good/order/add?id=" + id + "&ids=" + str});
-              }
+                if (arr.length == 0) {
+                  this.$message.error("该订单已全部生成采购单，请知悉!");
+                  return;
+                }
 
+                if (arr.length > 0) {
+                  str = arr.join(",");
+                  this.$router.push({
+                    path: "/good/order/add?id=" + id + "&ids=" + str,
+                  });
+                }
+              }
             }
-
-          }
-          //如果采购订单的商品个数不等与 采购单里面的商品个数
-          if(purcaseOrder.length>goodOrder.length){
-           var arrList = []
-           var str = "";
-            if (newArr.length > 0) {
-              for (let i = 0; i < purcaseOrder.length; i++) {
-                for (let j = 0; j < newArr.length; j++) {
-                  //如果采购订单的商品个数不等与 采购单里面的商品个数
-                  if(purcaseOrder[i].project_id != newArr[j].project_id){
-                     arrList.push(purcaseOrder[i].project_id)
+            //如果采购订单的商品个数不等与 采购单里面的商品个数
+            if (purcaseOrder.length > goodOrder.length) {
+              var arrList = [];
+              var str = "";
+              if (newArr.length > 0) {
+                for (let i = 0; i < purcaseOrder.length; i++) {
+                  for (let j = 0; j < newArr.length; j++) {
+                    //如果采购订单的商品个数不等与 采购单里面的商品个数
+                    if (purcaseOrder[i].project_id != newArr[j].project_id) {
+                      arrList.push(purcaseOrder[i].project_id);
+                    }
                   }
                 }
-              }
-              //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成
-              console.log("are232323323223322323",arrList)
-              if(arrList.length > 0){
-                str = arrList.join(",");
-                this.$router.push({path: "/good/order/add?id=" + id + "&ids=" + str});
+                //如果total的长度等于 采购单的长度,怎表示该采购订单已经全部生成
+                console.log("are232323323223322323", arrList);
+                if (arrList.length > 0) {
+                  str = arrList.join(",");
+                  this.$router.push({
+                    path: "/good/order/add?id=" + id + "&ids=" + str,
+                  });
+                }
               }
             }
-           }
           }
         }
       });
     },
     addressChange() {
+      var discount_amount = 0;
       if (this.rate_of_concession > 0) {
-        this.discount_amount = (
+        discount_amount = (
           (this.rate_of_concession / 100) *
           this.total_price
         ).toFixed(2);
       }
+      this.discount_amount = discount_amount;
+    },
+    count_discount() {
+      this.rate_of_concession = (
+        this.discount_amount /
+        (this.total_price * 0.01)
+      ).toFixed(2);
     },
     checkReturnOrder() {
       var id = this.$route.query.id;
       //获取购货订单号
       getGoodOrderList(id).then((response) => {
         if (response.data.state == 1) {
-          var list = response.data.data.list
-        
-          this.orderList = list
+          var list = response.data.data.list;
+
+          this.orderList = list;
           //如果长度大于0,有购货单不能反审核
           if (list.length > 0) {
-            this.$refs.Popup.dialogVisible = true
-            return 
+            this.$refs.Popup.dialogVisible = true;
+            return;
           }
           if (list.length == 0) {
-            this.getReturnOrder()
-            this.showOne = false
-            this.showTwo = true
-            this.showThree = false
+            this.getReturnOrder();
+            this.showOne = false;
+            this.showTwo = true;
+            this.showThree = false;
           }
         }
       });
@@ -1113,14 +1158,14 @@ export default {
         if (response.data.state == 1) {
           var msg = response.data.data.msg;
           this.disabled = false;
-          this.Reviewed = false
+          this.Reviewed = false;
           this.$message.success("反审核成功!");
           this.getPurchaseOrderDetail();
         }
       });
     },
     toClick(id) {
-      this.$router.push({path:"/good/order/edit?id=" + id});
+      this.$router.push({ path: "/good/order/edit?id=" + id });
     },
   },
   created() {
@@ -1174,9 +1219,25 @@ export default {
   margin-top: 15px;
   margin-bottom: 15px;
 }
+/deep/ .el-table--scrollable-x .el-table__body-wrapper {
+  overflow: auto;
+}
+/deep/ .gutter {
+  width: 15px !important;
+  display: inline-block !important;
+}
+/deep/ .el-table__fixed-right-patch {
+  width: 15px !important;
+}
+
+/deep/ .el-table__fixed-right {
+  bottom: 0 !important;
+  left: auto;
+  right: 0;
+}
 /deep/ .el-table__body-wrapper::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
+  width: 15px !important;
+  height: 15px !important;
 }
 </style>
 
@@ -1203,17 +1264,15 @@ export default {
 .el-table::before {
   background-color: #d0d3da;
 }
-.el-table__fixed-right {
+/* .el-table__fixed-right {
   width: 150px;
   bottom: 20px;
   height: 100%;
-}
+} */
 .reviewImg {
   position: fixed;
   left: 50%;
   transform: translateX(-50%);
   top: 30%;
 }
-
-
 </style>

src/xt_pages/supply/components/editSupply.vue

@@ -916,9 +916,9 @@ border-color: #d0d3da;
 .el-table::before {
 background-color: #d0d3da;
 }
-.el-table__fixed-right{
+/* .el-table__fixed-right{
   width:150px;
-  /* bottom: 20px; */
+  bottom: 20px;
   height: 100%;
-}
+} */
 </style>

src/xt_pages/supply/goodreturn.vue

@@ -87,7 +87,7 @@
         border
         style="width: 100%"
       >
-        <el-table-column label="单据日期" align="center" width="200">
+        <el-table-column label="单据日期" align="center" width="100">
           <template slot-scope="scope">
             <span>{{ getTimes(scope.row.document_date) }}</span>
           </template>
@@ -124,14 +124,14 @@
             >
           </template>
         </el-table-column>
-        <el-table-column label="采购金额" align="center" width="200">
+        <el-table-column label="采购金额" align="center" width="130">
           <template slot-scope="scope">
             <span v-if="getAllBuyPrice(scope.row.cancelOrder) > 0">{{
               getAllBuyPrice(scope.row.cancelOrder)
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="优惠后金额" align="center" width="200">
+        <el-table-column label="优惠后金额" align="center" width="130">
           <template slot-scope="scope">
             <span v-if="getAllBuyPrice(scope.row.cancelOrder) > 0">{{
               getAllBuyPriceOne(
@@ -141,34 +141,35 @@
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="已退款" align="center" width="200">
+        <el-table-column label="已退款" align="center" width="130">
           <template slot-scope="scope">
             <span v-if="scope.row.payment > 0">{{ scope.row.payment }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="数量" align="center" width="200">
+        <el-table-column label="数量" align="center" width="120">
           <template slot-scope="scope">
             {{ getCount(scope.row.cancelOrder) }}
           </template>
         </el-table-column>
 
-        <el-table-column label="退款状态" align="center" width="200">
+        <el-table-column label="退款状态" align="center" width="120">
           <template slot-scope="scope">
             <!-- <span v-if="scope.row.is_check == 2">未审核</span>
            <span v-if="scope.row.is_check == 1">已审核</span> -->
+          
            <span v-if="scope.row.payment == 0">未退款</span>
            <span v-if="scope.row.payment > 0 && scope.row.payment< getAllBuyPriceOne(scope.row.cancelOrder,scope.row.discount_amount)">部分退款</span>
            <span v-if="scope.row.payment > 0 && scope.row.payment == getAllBuyPriceOne(scope.row.cancelOrder,scope.row.discount_amount)">全部退款</span>
           </template>
         </el-table-column>
 
-        <el-table-column label="制单人" align="center" width="200">
+        <el-table-column label="制单人" align="center" width="120">
           <template slot-scope="scope">
             {{ getDocName(scope.row.creater) }}
           </template>
         </el-table-column>
 
-        <el-table-column label="审核人" align="center" width="200">
+        <el-table-column label="审核人" align="center" width="120">
           <template slot-scope="scope">
             {{ getDocName(scope.row.checker) }}
           </template>

src/xt_pages/supply/supplyQuery.vue

@@ -15,7 +15,7 @@
         <div>
           <el-select
             v-model="type_name"
-            style="width: 170px; margin-right: 10px"
+            style="width: 220px; margin-right: 10px"
             clearable
             placeholder="请选择供应商类别"
             @change="changeTypeName"

src/xt_pages/user/doctorAdvice.vue

@@ -160,7 +160,7 @@
         </el-table-column>
 
      、
-        
+
         <el-table-column
           label="开嘱时间"
           width="180"
@@ -168,8 +168,8 @@
           align="center"
         >
           <template slot-scope="scope">
-            <span v-if="org_id == 10215">{{ scope.row.start_time | parseTime("{y}-{m}-{d} {h}:{i}") }} </span> 
-            <span v-else>{{ scope.row.start_time | parseTime("{y}-{m}-{d} {h}:{i}") }} </span> 
+            <span v-if="org_id == 10215">{{ scope.row.start_time | parseTime("{y}-{m}-{d} {h}:{i}") }} </span>
+            <span v-else>{{ scope.row.start_time | parseTime("{y}-{m}-{d} {h}:{i}") }} </span>
           </template>
         </el-table-column>
         <el-table-column
@@ -968,7 +968,7 @@
             <el-col :span="14">
               <el-form-item label="药品规格 :" prop="advice_desc">
                 <el-col :span="6">
-               
+
                 <el-autocomplete
                   style="width:100px;"
                   class="inline-input"
@@ -1049,7 +1049,7 @@
                     >
                     </el-option>
                   </el-select>
-                
+
                 </el-col>
               </el-form-item>
             </el-col>
@@ -1518,7 +1518,7 @@
             </li>
             <li v-if="currentPatient.user_org_id!=10090">
               <span class="name">科别：</span>
-             
+
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
             </li>
             <li>
@@ -1650,17 +1650,17 @@
             </li>
             <li v-if="currentPatient.user_org_id!=10090">
               <span class="name" style="width:30px;">科：</span>
-             
+
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
             </li>
             <li v-if="currentPatient.user_org_id!=10090">
               <span class="name" style="width:30px;">区：</span>
-             
+
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
             </li>
             <li v-if="currentPatient.user_org_id!=10090">
               <span class="name" style="width:30px;">房：</span>
-              
+
               <span class="InputBox">&nbsp;&nbsp;&nbsp;&nbsp;</span>
             </li>
             <li v-if="currentPatient.user_org_id!=10090">
@@ -2223,7 +2223,7 @@ export default {
           }
 
           console.log("2323223",this.adviceForm)
-        
+
           EditNewDoctorAdvice(
             this.patientID,
             this.adviceForm.id,
@@ -2277,7 +2277,7 @@ export default {
       });
     },
     submitgroupAdvice(formName) {
-     
+
       this.addLoading = true;
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -2290,8 +2290,8 @@ export default {
             remark: this.groupForm.remark,
             parent_id: this.groupForm.parent_id,
           };
-        
-         
+
+
           var adviceNames = [];
           for (const index in this.groupForm.adviceNames) {
             this.groupForm.adviceNames[
@@ -2312,7 +2312,7 @@ export default {
             mode = "1-3"
           }
         console.log("长期医嘱3333",submitForm)
-       
+
         if(this.private_drug_config != null&&this.private_drug_config.drug_start == 1){
               for(let index=0;index<submitForm.adviceNames.length;index++){
                   for(let i=0;i<this.medicals.length;i++){
@@ -2324,7 +2324,7 @@ export default {
               }
           }
           console.log("模板数据",submitForm)
-        
+
           CreateNewGroupAdvice(this.patientID, 0, submitForm, mode).then(
             response => {
               if (response.data.state == 0) {
@@ -2417,7 +2417,7 @@ export default {
               this.adviceForm.advice_name = arr[0]
           }
           console.log("222222",this.adviceForm)
-         
+
           CreateNewDoctorAdvice(this.patientID, this.adviceForm, mode).then(
             response => {
               if (response.data.state == 0) {
@@ -3028,7 +3028,7 @@ export default {
           row_key: this.rowKey,
           table: []
         };
-      
+
         if (item.id in childMap) {
           for (const key in childMap[item.id]) {
             this.rowKey++;
@@ -3068,7 +3068,7 @@ export default {
     },
 
     openEdit(index, row) {
-      
+
       this.currentIndex = index;
       (this.dialogTitle = "修改医嘱"), (this.isEdit = true);
 
@@ -4038,7 +4038,7 @@ export default {
       });
     },
     submitNameForm(formName) {
-       
+
        if(this.src_type == ""){
           this.nameForm.way = 0
           this.nameForm.drug_id = 0
@@ -4049,7 +4049,7 @@ export default {
           this.nameForm.advice_name = arr[0]
        }
       console.log("医嘱2222",this.nameForm)
-     
+
       var _this = this;
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -4355,17 +4355,17 @@ export default {
     // 获取勾选中的行
     getPrintInfo(ids) {
       console.log("23332332323232",this.adviceType,"33333333",this.stopType)
-     
+
       getPrintInfo({ids:ids},this.adviceType,this.stopType).then(response => {
         if (response.data.state === 1) {
           var doctoradvice = response.data.data.doctoradvice;
           console.log("doctoradvice", doctoradvice);
-         
+
           this.dataAdvice = doctoradvice;
           if (this.adviceType === 3 || this.adviceType === 2 || this.adviceType == 4) {
-           
+
             this.lstableData = this.dataAdvice;
-            
+
           } else if (this.adviceType === 1) {
             this.cqtableData = doctoradvice;
           }
@@ -4503,7 +4503,7 @@ export default {
             this.private_drug_config = response.data.data.private_drug_config
             console.log("medicals",medicalList)
             this.medicals = medicalList
-          
+
       })
     },
     changeDrugNameTwo(name){
@@ -4514,7 +4514,7 @@ export default {
         if (this.all_drug[i].drug_name == name) {
             this.drugSpec = this.all_drug[i].drug_specs
           }
-       }   
+       }
     },
    changeDrugDescTwo(name){
       this.current_drug_spec = name
@@ -4611,7 +4611,7 @@ export default {
 
       handleSelect1(val){
         this.drug_id = val.drug_id
-        
+
       },
       handleSelect(val){
         this.src_type = 1