Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

public/static/inspection.html

@@ -13,8 +13,8 @@
       }
 
       #app {
-        height: 98vh;
-        position: relative;
+        /* height: 98vh;
+        position: relative; */
       }
 
       .content {
@@ -183,7 +183,6 @@
       <div class="small-content" v-if="smallContent">
         <div class="small-title">
           <div>粮食质检单</div>
-          <img class="small-img" src="../img/add.png" alt="">
         </div>
         <div class="small-row">
           <div>编号</div>

public/static/payprint.html

@@ -213,6 +213,7 @@
             <tr class="row">
               <td class="col col-bgc" v-if="printData.type == '潮粮'">净重单价</td>
               <td class="col col-bgc" v-if="printData.type == '干粮'">单价</td>
+              <td class="col col-bgc">扣单价</td>
               <td class="col col-bgc">粮款</td>
               <td class="col col-bgc">称重补助</td>
               <td class="col col-bgc">运费补助</td>
@@ -221,11 +222,11 @@
               <td class="col col-bgc">称重扣款</td>
               <td class="col col-bgc">运费扣款</td>
               <td class="col col-bgc">卸车扣款</td>
-              <td class="col col-bgc">质量扣款</td>
             </tr>
             <tr class="row">
               <td class="col " v-if="printData.type == '潮粮'">{{printData.tidalGrainPrice}}</td>
               <td class="col " v-if="printData.type == '干粮'">{{printData.qualityInspectionManagement.dryGrainPrice}}</td>
+              <td class="col ">{{printData.unitDeduction}}</td>
               <td class="col ">{{printData.grainMoney}}</td>
               <td class="col ">{{printData.weighingSubsidy}}</td>
               <td class="col ">{{printData.freightSubsidy}}</td>
@@ -234,9 +235,9 @@
               <td class="col ">{{printData.weighingDeduction}}</td>
               <td class="col ">{{printData.freightDeduction}}</td>
               <td class="col ">{{printData.unloadDeduction}}</td>
-              <td class="col ">{{printData.qualityDeduction}}</td>
             </tr>
             <tr class="row">
+              <td class="col col-bgc">质量扣款</td>
               <td class="col col-bgc">其他扣款</td>
               <td class="col col-bgc" v-if="printData.type == '潮粮'">纯重单价</td>
               <td class="col col-bgc">合计应付</td>
@@ -245,6 +246,7 @@
               <td class="col col-bgc" colspan="5">记事</td>
             </tr>
             <tr class="row">
+              <td class="col ">{{printData.qualityDeduction}}</td>
               <td class="col ">{{printData.otherDeduction}}</td>
               <td class="col " v-if="printData.type == '潮粮'">{{printData.solidGrainPrice}}</td>
               <td class="col ">{{printData.calculationPayable}}</td>

public/static/weightCheck.html

@@ -13,8 +13,8 @@
       }
 
       #app {
-        height: 98vh;
-        position: relative;
+        /* height: 98vh;
+        position: relative; */
       }
 
       .content {
@@ -92,7 +92,7 @@
         left: 0;
         right: 0;
         margin: auto;
-        height: 650px;
+        height: 450px;
       }
 
       .small-title {
@@ -202,7 +202,6 @@
       <div class="small-content" v-if="smallContent">
         <div class="small-title">
           <div>粮食检斤单</div>
-          <img class="small-img" src="../img/add.png" alt="">
         </div>
         <div class="small-row">
           <div>编号</div>

src/App.vue

@@ -75,7 +75,7 @@ export default {
   overflow: scroll !important;
 }
 ::-webkit-scrollbar {
-  width: 0 !important;
+  width: 10px !important;
   height: 10px !important;
 }
 ::-webkit-scrollbar-thumb {

src/api/V2/warehouse/index.js

@@ -45,7 +45,7 @@ export const API_POST_WAREHOUSE_CLEARANCEE = '/warehouseBaseInfo/api/editCleared
 //临时出入库合同编号下拉
 export const API_GET_WAREHOUSE_NO = '/warehouseBaseInfo/selectContractNoList'
 // 获取负责人
-export const API_GET_STAFF = '/staff/query/getStaffListByCompId'
+export const API_GET_STAFF = '/staff/query/getStaffListByCompIdAndWarehouseId'
 //临时仓库记录
 export const API_GET_WAREHOUSE_RECORDSS = '/warehouseInOutInfo/selectInfoTemporary'
 

src/common.js

@@ -1,8 +1,10 @@
 
    const houseName= [{ payname: "" },{ payname: "" },{ payname: "" },{ payname: "" }]
    let commonWeighingList = []
+   const name = ''
 
 export default {
     houseName,
-    commonWeighingList
+    commonWeighingList,
+    name
 }

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -32,24 +32,24 @@
             </el-form-item>
           </div>
           <div class="grid-content">
-            <el-form-item label="干粮收购价格（元/公斤）">
+            <el-form-item label="干粮收购价格（元/公斤）"  label-width="180px">
               <el-input v-model="baseInfoForm.dryGrainPrice" :disabled="!isEdit"></el-input>
             </el-form-item>
           </div>
         </div>
         <div class="row2">
           <div class="grid-content">
-            <el-form-item label="干粮水分">
-              <el-input v-model="baseInfoForm.waterMin" @input="changeMinWater" :disabled="!isEdit"></el-input>
+            <el-form-item label="干粮水分(%)">
+              <el-input v-model="baseInfoForm.waterMin" @input="changeMinWater" :disabled="!isEdit" id="aaa"></el-input>
             </el-form-item>
           </div>
           <div class="grid-content">
-            <el-form-item label="水分上限">
+            <el-form-item label="水分上限(%)">
               <el-input v-model="baseInfoForm.waterMax" @input="changeMaxWater" :disabled="!isEdit"></el-input>
             </el-form-item>
           </div>
           <div class="grid-content">
-            <el-form-item label="销售上限(年/吨)">
+            <el-form-item label="销售上限(吨/年)">
               <el-input v-model="baseInfoForm.saleLimit" :disabled="!isEdit"></el-input>
             </el-form-item>
           </div>
@@ -79,7 +79,7 @@
           <div class="count">
             <div class="left">
               <div>水分（%）</div>
-              <div>降幅（元/0.5%）</div>
+              <div>降幅（元/0.1%）</div>
             </div>
             <div class="right">
               <div class="line"></div>
@@ -95,19 +95,19 @@
                       v-show="item1.type!=1&&item1.type!=2&&item1.type!=3" :disabled="!isEdit">-</el-button>
                   </div>
                   <div v-show="item1.type!=4">
-                    <input v-if='item1.type==1' class="water-price" v-model="baseInfoForm.waterMin"
+                    <input v-if='item1.type==1' class="water-price" :class="item1.isWrite?'white-bgc':''" v-model="baseInfoForm.waterMin"
                       :disabled="item1.isWrite?false:true"></input>
-                    <input v-if='item1.type==2' class="water-price" v-model="baseInfoForm.waterBase"
+                    <input v-if='item1.type==2' class="water-price" :class="item1.isWrite?'white-bgc':''" v-model="baseInfoForm.waterBase"
                       :disabled="item1.isWrite?false:true"></input>
-                    <input v-if='item1.type==3' class="water-price" v-model="baseInfoForm.waterMax"
+                    <input v-if='item1.type==3' class="water-price" :class="item1.isWrite?'white-bgc':''" v-model="baseInfoForm.waterMax"
                       :disabled="item1.isWrite?false:true"></input>
-                    <input v-if='item1.type==5' class="water-price" v-model="item1.water"
+                    <input v-if='item1.type==5' class="water-price" :class="item1.isWrite?'white-bgc':''" v-model="item1.water"
                       :disabled="isEdit?false:true"></input>
                   </div>
                   <div class="circle" v-if="item1.type!=4"></div>
                 </div>
                 <div class="bottom-price">
-                  <input v-if="item1.type==4" class="water-price" v-model="item1.jfprice" :disabled="!isEdit"></input>
+                  <input v-if="item1.type==4" class="water-price" :class="isEdit?'white-bgc':''" v-model="item1.jfprice" :disabled="!isEdit"></input>
                 </div>
               </div>
             </div>
@@ -119,7 +119,7 @@
     <el-main v-show="!isCountShow">
       <div class="page2-content">
         <div class="titel">
-          玉米价格对照表（按水分）
+          {{selectVal}}价格对照表（按水分）
         </div>
         <el-table :data="tableData" style="width: 100%" :row-class-name="tableRowClassName">
           <el-table-column prop="waterMin" label="水分下限(%)">
@@ -174,38 +174,38 @@
         price: 0,
         left: [],
         right: [],
-        selectVal: "",
+        selectVal: '',
         goodnameList: [],
         tableData: [],
-        submitName: "提交",
+        submitName: '提交',
         isCountShow: true,
         priceList: [{
           index: 0,
           checkList: [],
-          basicUnitPrice: "",
+          basicUnitPrice: '',
           detailList: [{
               type: 1,
-              name: "干粮",
-              water: "",
+              name: '干粮',
+              water: '',
               isWrite: false
             },
             {
               type: 4,
-              jfprice: ""
+              jfprice: ''
             },
             {
               type: 2,
-              name: "基准",
+              name: '基准',
               water: '',
               isWrite: false
             },
             {
               type: 4,
-              jfprice: ""
+              jfprice: ''
             },
             {
               type: 3,
-              name: "上限",
+              name: '上限',
               water: '',
               isWrite: false
             },
@@ -272,7 +272,6 @@
             this.goodnameList = response
             this.selectVal = response[0].constValue
           } else {
-            this.goodnameList = _list
             this.goodnameList = _list
             if (_list.length != 0) {
               this.selectVal = _list[0].constValue
@@ -280,10 +279,12 @@
           }
         })
       this.isCountShow = true
+     
       switch (this.$route.query.type) {
-        case "新增":
-          this.submitName = "提交"
+        case '新增':
+          this.submitName = '提交'
           this.isCountShow = true
+          this.checkList=[]
           this.baseInfoForm = {
             warehouseId: '',
             warehouseName: '',
@@ -316,49 +317,49 @@
           this.priceList = [{
             index: 0,
             checkList: [],
-            basicUnitPrice: "",
+            basicUnitPrice: '',
             detailList: [{
                 type: 1,
-                name: "干粮",
-                water: "",
+                name: '干粮',
+                water: '',
                 isWrite: false
               },
               {
                 type: 4,
-                jfprice: ""
+                jfprice: ''
               },
               {
                 type: 2,
-                name: "基准",
+                name: '基准',
                 water: '',
                 isWrite: false
               },
               {
                 type: 4,
-                jfprice: ""
+                jfprice: ''
               },
               {
                 type: 3,
-                name: "上限",
+                name: '上限',
                 water: '',
                 isWrite: false
               },
             ],
           }]
           break;
-        case "编辑":
+        case '编辑':
           this.isEdit = true;
-          this.submitName = "提交"
+          this.submitName = '提交'
           this.getData()
           break;
-        case "审核中":
+        case '审核中':
           // this.isEdit = false;
-          this.submitName = "通过"
+          this.submitName = '通过'
           this.getData()
           break;
-        case "查看":
+        case '查看':
           this.isEdit = false;
-          this.submitName = "计算"
+          this.submitName = '计算'
           this.getData()
           break;
         default:
@@ -378,9 +379,21 @@
           //构造查看priceList数据
           this.priceList = []
           this.makeLookPriceList()
+          if(this.$route.query.type == '编辑'){
+               let _data = this.priceList
+              for (let i = 0; i < _data.length; i++) {
+                if (i == 0) this.checkList1 = _data[i].checkList
+                if (i == 1) this.checkList2 = _data[i].checkList
+                if (i == 2) this.checkList3 = _data[i].checkList
+                if (i == 3) this.checkList4 = _data[i].checkList
+              }
+               this.checkList = [...new Set([...this.checkList1, ...this.checkList2, ...this.checkList3, ...this.checkList4])]
+          }
         })
       },
-      goodsChange(e) {},
+      goodsChange(e) {
+        
+      },
       changeBaseWater(val) {
         for (let i = 0; i < this.priceList.length; i++) {
           for (let k = 0; k < this.priceList[i].detailList.length; k++) {
@@ -440,14 +453,14 @@
         } else {
           item.index++
           item.detailList.splice(index + 1, 0, {
-            name: "分界",
+            name: '分界',
             water: '',
             type: 5,
             index: 1,
             isWrite: true
           });
           item.detailList.splice(index + 1, 0, {
-            jfprice: "",
+            jfprice: '',
             type: 4
           });
           this.makeSpliceIndex(item, item1, index)
@@ -493,12 +506,12 @@
           s1 = arg1.toString(),
           s2 = arg2.toString();
         try {
-          m += s1.split(".")[1].length
+          m += s1.split('.')[1].length
         } catch (e) {}
         try {
-          m += s2.split(".")[1].length
+          m += s2.split('.')[1].length
         } catch (e) {}
-        return Number(s1.replace(".", "")) * Number(s2.replace(".", "")) / Math.pow(10, m)
+        return Number(s1.replace('.', '')) * Number(s2.replace('.', '')) / Math.pow(10, m)
       },
       //保留两位小数
       keepTwoDecimal(num) {
@@ -525,27 +538,27 @@
           checkList: [],
           detailList: [{
               type: 1,
-              name: "干粮",
+              name: '干粮',
               water: this.baseInfoForm.waterMin,
               isWrite: false
             },
             {
               type: 4,
-              jfprice: ""
+              jfprice: ''
             },
             {
               type: 2,
-              name: "基准",
+              name: '基准',
               water: this.baseInfoForm.waterBase,
               isWrite: false
             },
             {
               type: 4,
-              jfprice: ""
+              jfprice: ''
             },
             {
               type: 3,
-              name: "上限",
+              name: '上限',
               water: this.baseInfoForm.waterMax,
               isWrite: false
             },
@@ -555,7 +568,6 @@
       },
       // 删除价格组
       delSetPrice(item, index) {
-        // debugger
         let that = this
         this.checkList1 = []
         this.checkList2 = []
@@ -634,28 +646,28 @@
       //打印
       print() {
         localStorage.setItem('pricePrintList', JSON.stringify(this.baseInfoForm.detailPrints));
-        window.open("../../../static/print.html?name=" + this.baseInfoForm.goodsName)
+        window.open('../../../static/print.html?name=' + this.baseInfoForm.goodsName)
       },
       validate() {
         let that = this
 
         function _baseWaterValidate(min, max, saveNum, point, type, inputVal) {
           let _val1 = inputVal
-          let _pointVal1 = _val1.toString().split(".")[1]
+          let _pointVal1 = _val1.toString().split('.')[1]
           if (_pointVal1 == undefined) _pointVal1 = 0
-          if (typeof(_pointVal1) == "string") _pointVal1 = _pointVal1.length
+          if (typeof(_pointVal1) == 'string') _pointVal1 = _pointVal1.length
           let _tobeVal1 = _val1 % point
-          if (type == "waterBase") {
+          if (type == 'waterBase') {
             if (_val1 <= max && _val1 >= min && _pointVal1 <= saveNum && _tobeVal1 == 0) {
               return false
             }
           }
-          if (type == "deductWeight") {
+          if (type == 'deductWeight') {
             if (_val1 <= max && _val1 >= min && _pointVal1 <= saveNum) {
               return false
             }
           }
-          if (type == "saleLimit") {
+          if (type == 'saleLimit') {
             if (_val1 <= max && _val1 >= min) {
               // Number.isInteger(that.baseInfoForm.saleLimit)
               return false
@@ -663,9 +675,9 @@
           }
           return true
         }
-        if (this.baseInfoForm.waterBase == '' || _baseWaterValidate(1, 100, 1, 0.5, "waterBase", parseFloat(this
+        if (this.baseInfoForm.waterBase == '' || _baseWaterValidate(1, 100, 1, 0.5, 'waterBase', parseFloat(this
             .baseInfoForm.waterBase))) {
-          if (_baseWaterValidate(1, 100, 1, 0.5, "waterBase", parseFloat(this.baseInfoForm.waterBase))) {
+          if (_baseWaterValidate(1, 100, 1, 0.5, 'waterBase', parseFloat(this.baseInfoForm.waterBase))) {
             that.$message.error('水分基准输入错误,最多保留1位小数，基准水分须可被0.5整除！');
           } else {
             this.$message.error('基准水分不能为空！');
@@ -691,29 +703,39 @@
           return false
         }
 
-        if (this.baseInfoForm.waterMin == '' || _baseWaterValidate(1, 100, 1, 0.5, "waterBase", parseFloat(this
+        if (this.baseInfoForm.waterMin == '' || _baseWaterValidate(1, 100, 1, 0.5, 'waterBase', parseFloat(this
             .baseInfoForm.waterMin))) {
           if (this.baseInfoForm.waterMin == '') {
             this.$message.error('干粮水分不能为空！')
           }
-          return false
-          if (_baseWaterValidate(1, 100, 1, 0.5, "waterBase", parseFloat(this.baseInfoForm.waterMin))) {
-            that.$message.error('干粮水分输入错误!')
+          if (_baseWaterValidate(1, 100, 1, 0.5, 'waterBase', parseFloat(this.baseInfoForm.waterMin))) {
+            that.$message.error('干粮水分输入错误,最多保留1位小数，干粮水分须可被0.5整除！')
           }
           return false
         }
-        if (this.baseInfoForm.waterMax == '' || _baseWaterValidate(1, 100, 1, 0.5, "waterBase", parseFloat(this
+        
+        if (this.baseInfoForm.waterBase>this.baseInfoForm.waterMax) {
+            this.$message.error('基准水分须小于水分上限！')
+          return false
+        }
+        
+        if (this.baseInfoForm.waterMin>this.baseInfoForm.waterBase) {
+            this.$message.error('干粮水分须小于基准水分！')
+          return false
+        }
+
+        if (this.baseInfoForm.waterMax == '' || _baseWaterValidate(1, 100, 1, 0.5, 'waterBase', parseFloat(this
             .baseInfoForm.waterMax))) {
-          if (_baseWaterValidate(1, 100, 1, 0.5, "waterBase", parseFloat(this.baseInfoForm.waterMax))) {
-            that.$message.error('水分上限输入错误!');
+          if (_baseWaterValidate(1, 100, 1, 0.5, 'waterBase', parseFloat(this.baseInfoForm.waterMax))) {
+            that.$message.error('水分上限输入错误,最多保留1位小数，干粮水分须可被0.5整除！');
           } else {
             this.$message.error('水分上限不能为空！');
           }
           return false
         }
-        if (this.baseInfoForm.saleLimit == '' || _baseWaterValidate(100, 100000, '', '', "saleLimit", parseFloat(this
+        if (this.baseInfoForm.saleLimit == '' || _baseWaterValidate(100, 100000, '', '', 'saleLimit', parseFloat(this
             .baseInfoForm.saleLimit))) {
-          if (_baseWaterValidate(100, 100000, '', '', "saleLimit", parseFloat(this.baseInfoForm.saleLimit))) {
+          if (_baseWaterValidate(100, 100000, '', '', 'saleLimit', parseFloat(this.baseInfoForm.saleLimit))) {
             that.$message.error('销售上限输入错误!');
           } else {
             this.$message.error('销售上限不能为空！');
@@ -726,12 +748,12 @@
         }
         for (let i = 0; i < this.priceList.length; i++) {
           let _item = this.priceList[i]
-          if (_item.basicUnitPrice == '' || _baseWaterValidate(0, 50, 2, '', "deductWeight", parseFloat(_item
+          if (_item.basicUnitPrice == '' || _baseWaterValidate(0, 50, 2, '', 'deductWeight', parseFloat(_item
               .basicUnitPrice))) {
             if (_item.basicUnitPrice == '') {
               this.$message.error('基准单价不能为空！');
             } else {
-              that.$message.error('基准单价输入错误！');
+              that.$message.error('基准单价输入错误,0-50数字最多保留两位小数！');
             }
             return false
           }
@@ -742,9 +764,9 @@
           for (let j = 0; j < _item.detailList.length; j++) {
             let _item1 = _item.detailList[j]
             if (_item1.type == 4) {
-              if (_item1.jfprice == "" || _baseWaterValidate(0, 100, 3, '', 'deductWeight', parseFloat(_item1
+              if (_item1.jfprice == '' || _baseWaterValidate(0, 100, 3, '', 'deductWeight', parseFloat(_item1
                   .jfprice))) {
-                if (_item1.jfprice == "") {
+                if (_item1.jfprice == '') {
                   this.$message.error('降幅价格不能为空！');
                 } else {
                   that.$message.error('降幅输入错误！');
@@ -752,8 +774,8 @@
                 return false
               }
             } else {
-              if (_item1.water == "" || _baseWaterValidate(0, 100, 1, 0.5, "waterBase", parseFloat(_item1.water))) {
-                if (_item1.water == "") {
+              if (_item1.water == '' || _baseWaterValidate(0, 100, 1, 0.5, 'waterBase', parseFloat(_item1.water))) {
+                if (_item1.water == '') {
                   this.$message.error('分界水分不能为空！')
                 } else {
                   that.$message.error('分界值输入错误！');
@@ -778,16 +800,19 @@
       },
       // 提交
       submit() {
+        this.isCountShow = false
+        let isValidate = false
+         isValidate = this.validate()
+                if (isValidate) {
         this.makeTableList()
         this.baseInfoForm.details = []
         this.makePriceDataList()
         this.baseInfoForm.goodsName = this.selectVal
-        let isValidate = false
         switch (this.$route.query.type) {
-          case "查看":
+          case '查看':
             this.isCountShow = false;
             break;
-          case "新增":
+          case '新增':
             isValidate = this.validate()
             if (isValidate) {
               purchasePriceAdd(this.baseInfoForm).toPromise().then((response) => {
@@ -796,7 +821,7 @@
               })
             }
             break;
-          case "编辑":
+          case '编辑':
             this.getEditCheckList()
             isValidate = this.validate()
             if (isValidate) {
@@ -805,7 +830,7 @@
               })
             }
             break;
-          case "审核中":
+          case '审核中':
             // this.makePriceDataList()
             this.getEditCheckList()
             isValidate = this.validate()
@@ -824,6 +849,8 @@
             }
             break;
         }
+            }
+
       },
       //审核
       audit(item, status, status2) {
@@ -860,17 +887,20 @@
         let _obj = {}
         let _waterMin = parseFloat(this.baseInfoForm.waterMin)
         let _waterMax = parseFloat(this.baseInfoForm.waterBase)
-        let _count = (_waterMax - _waterMin) / 0.5
+        let _count = (_waterMax - _waterMin) / 0.1 
         for (let i = 0; i < _count; i++) {
-          if (i == 0) {
-            _waterMax -= 0.1
-          } else {
-            _waterMax -= 0.5
-          }
-          let priceList = this.calculatePrice(_waterMax)
+          // if (i == 0) {
+          //   _waterMax -= 0.1
+          // } 
+          // else {
+          //   _waterMax -= 0.5
+          // }
+          _waterMax -= 0.1
+          let priceList = this.calculatePrice(this.keepOneDecimal(_waterMax ))
+          
           _obj = {
-            waterMin: this.keepOneDecimal(_waterMax - 0.4),
-            waterMax: this.keepOneDecimal(_waterMax),
+            waterMin: this.keepOneDecimal(_waterMax ),
+            waterMax: this.keepOneDecimal(_waterMax + 0.09),
             price1: this.keepTwoDecimal(priceList[0]),
             price2: this.keepTwoDecimal(priceList[1]),
             price3: this.keepTwoDecimal(priceList[2]),
@@ -881,24 +911,28 @@
         _obj = {}
         _waterMin = parseFloat(this.baseInfoForm.waterBase)
         _waterMax = parseFloat(this.baseInfoForm.waterMax)
-        _count = (_waterMax - _waterMin) / 0.5
+        _count = (_waterMax - _waterMin) / 0.1
         for (let i = 0; i < _count; i++) {
-          if (i == 0) {
-            _waterMin += 0.4
-          } else {
-            _waterMin += 0.5
+          // if (i == 0) {
+          //   _waterMin += 0.4
+          // } else {
+          //   _waterMin += 0.5
+          // }
+          if (i != 0) {
+            _waterMin += 0.1
           }
-          let priceList = this.calculatePriceRight(_waterMin)
+          
+          let priceList = this.calculatePriceRight(this.keepOneDecimal(_waterMin ))
           _obj = {
-            waterMin: this.keepOneDecimal(_waterMin - 0.4),
-            waterMax: this.keepOneDecimal(_waterMin),
+            waterMin: this.keepOneDecimal(_waterMin ),
+            waterMax: this.keepOneDecimal(_waterMin + 0.09),
             price1: this.keepTwoDecimal(priceList[0]),
             price2: this.keepTwoDecimal(priceList[1]),
             price3: this.keepTwoDecimal(priceList[2]),
             priceOther: this.keepTwoDecimal(priceList[3]),
           }
           _list.push(_obj)
-          console.log("_list", _list)
+          console.log('_list', _list)
 
         }
         this.baseInfoForm.detailPrints = _list
@@ -906,6 +940,7 @@
       },
       // 获取分界价格数据，构造分界价格区间数据
       getSplitPrice() {
+        let that = this;
         this.left = []
         this.right = []
         let _priceList = this.priceList;
@@ -923,16 +958,25 @@
             _rightObj.priceList = []
             _rightObj.haveSplit = false
 
+            //获取基准在x轴索引
 
-            for (let j = (_priceList[i].detailList.length + 1) / 2 - 1; j > 0; j--) {
+              let index = function(){
+              for(let index=0;index<_priceList[i].detailList.length;index++){
+                        if(_priceList[i].detailList[index].water==that.baseInfoForm.waterBase){
+                          return index
+                }
+              }
+           } 
+           console.log(index())
+          for (let j = index(); j > 0; j--) {
               if (_priceList[i].detailList[j] && _priceList[i].detailList[j].type != 4) {
                 if (_priceList[i].detailList[j].type != 1) {
-                  let baseprice = ""
-                  if (j == (_priceList[i].detailList.length + 1) / 2 - 1) {
+                  let baseprice = ''
+                  if (j == index()) {
                     baseprice = parseFloat(_priceList[i].basicUnitPrice)
                   } else {
                     baseprice = parseFloat(_priceList[i].basicUnitPrice + (parseFloat(_priceList[i].detailList[j + 2]
-                      .water) - parseFloat(_priceList[i].detailList[j].water)) / 0.5 * parseFloat(_priceList[i]
+                      .water) - parseFloat(_priceList[i].detailList[j].water)) / 0.1 * parseFloat(_priceList[i]
                       .detailList[j + 1].jfprice))
                   }
                   _leftObj.priceList.push({
@@ -944,22 +988,48 @@
                     jfprice: parseFloat(_priceList[i].detailList[j - 1].jfprice),
                     baseprice: baseprice,
                     price: (parseFloat(_priceList[i].detailList[j].water) - parseFloat(_priceList[i].detailList[j -
-                      2].water)) / 0.5 * parseFloat(_priceList[i].detailList[j - 1].jfprice)
+                      2].water)) / 0.1 * parseFloat(_priceList[i].detailList[j - 1].jfprice)
                   })
                 }
               }
             }
+
+            // for (let j = (_priceList[i].detailList.length + 1) / 2 - 1; j > 0; j--) {
+            //   if (_priceList[i].detailList[j] && _priceList[i].detailList[j].type != 4) {
+            //     if (_priceList[i].detailList[j].type != 1) {
+            //       let baseprice = ""
+            //       if (j == (_priceList[i].detailList.length + 1) / 2 - 1) {
+            //         baseprice = parseFloat(_priceList[i].basicUnitPrice)
+            //       } else {
+            //         baseprice = parseFloat(_priceList[i].basicUnitPrice + (parseFloat(_priceList[i].detailList[j + 2]
+            //           .water) - parseFloat(_priceList[i].detailList[j].water)) / 0.5 * parseFloat(_priceList[i]
+            //           .detailList[j + 1].jfprice))
+            //       }
+            //       _leftObj.priceList.push({
+            //         index: j,
+            //         priceStart: parseFloat(_priceList[i].detailList[j].water),
+            //         priceEnd: parseFloat(_priceList[i].detailList[j - 2].water),
+            //         type: parseFloat(_priceList[i].detailList[j].type),
+            //         water: _priceList[i].detailList[j].water,
+            //         jfprice: parseFloat(_priceList[i].detailList[j - 1].jfprice),
+            //         baseprice: baseprice,
+            //         price: (parseFloat(_priceList[i].detailList[j].water) - parseFloat(_priceList[i].detailList[j -
+            //           2].water)) / 0.5 * parseFloat(_priceList[i].detailList[j - 1].jfprice)
+            //       })
+            //     }
+            //   }
+            // }
             this.left.push(_leftObj)
-            console.log("this.left", this.left)
-            for (let k = (_priceList[i].detailList.length + 1) / 2 - 1; k <= _priceList[i].detailList.length; k++) {
+            console.log('this.left', this.left)
+                  for (let k = index(); k <= _priceList[i].detailList.length; k++) {
               if (_priceList[i].detailList[k] && _priceList[i].detailList[k].type != 4) {
                 if (_priceList[i].detailList[k].type != 3) {
-                  let baseprice = ""
-                  if (k == (_priceList[i].detailList.length + 1) / 2 - 1) {
+                  let baseprice = ''
+                  if (k == index()) {
                     baseprice = parseFloat(_priceList[i].basicUnitPrice)
                   } else {
                     baseprice = parseFloat(_priceList[i].basicUnitPrice - (parseFloat(_priceList[i].detailList[k]
-                      .water) - parseFloat(_priceList[i].detailList[k - 2].water)) / 0.5 * parseFloat(_priceList[i]
+                      .water) - parseFloat(_priceList[i].detailList[k - 2].water)) / 0.1 * parseFloat(_priceList[i]
                       .detailList[k - 1].jfprice))
                   }
                   _rightObj.priceList.push({
@@ -971,13 +1041,40 @@
                     jfprice: parseFloat(_priceList[i].detailList[k + 1].jfprice),
                     baseprice: baseprice,
                     price: (parseFloat(_priceList[i].detailList[k + 2].water) - parseFloat(_priceList[i].detailList[
-                      k].water)) / 0.5 * parseFloat(_priceList[i].detailList[k + 1].jfprice)
+                      k].water)) / 0.1 * parseFloat(_priceList[i].detailList[k + 1].jfprice)
                   })
                 }
               }
             }
+
+
+            // for (let k = (_priceList[i].detailList.length + 1) / 2 - 1; k <= _priceList[i].detailList.length; k++) {
+            //   if (_priceList[i].detailList[k] && _priceList[i].detailList[k].type != 4) {
+            //     if (_priceList[i].detailList[k].type != 3) {
+            //       let baseprice = ""
+            //       if (k == (_priceList[i].detailList.length + 1) / 2 - 1) {
+            //         baseprice = parseFloat(_priceList[i].basicUnitPrice)
+            //       } else {
+            //         baseprice = parseFloat(_priceList[i].basicUnitPrice - (parseFloat(_priceList[i].detailList[k]
+            //           .water) - parseFloat(_priceList[i].detailList[k - 2].water)) / 0.5 * parseFloat(_priceList[i]
+            //           .detailList[k - 1].jfprice))
+            //       }
+            //       _rightObj.priceList.push({
+            //         index: k,
+            //         priceStart: parseFloat(_priceList[i].detailList[k].water),
+            //         priceEnd: parseFloat(_priceList[i].detailList[k + 2].water),
+            //         type: parseFloat(_priceList[i].detailList[k].type),
+            //         water: _priceList[i].detailList[k].water,
+            //         jfprice: parseFloat(_priceList[i].detailList[k + 1].jfprice),
+            //         baseprice: baseprice,
+            //         price: (parseFloat(_priceList[i].detailList[k + 2].water) - parseFloat(_priceList[i].detailList[
+            //           k].water)) / 0.5 * parseFloat(_priceList[i].detailList[k + 1].jfprice)
+            //       })
+            //     }
+            //   }
+            // }
             this.right.push(_rightObj)
-            console.log("this.right", this.right)
+            console.log('this.right', this.right)
           }
         }
       },
@@ -988,10 +1085,10 @@
         let _listResult = []
         for (let i = 0; i < this.right.length; i++) {
           let _list = this.right[i].priceList
-          let tmp = ""
+          let tmp = ''
           for (let k = 0; k < _list.length; k++) {
             if (_waterMax < _list[k].priceEnd && _waterMax >= _list[k].priceStart) {
-              tmp = parseFloat(_list[k].baseprice - _list[k].jfprice * (((_waterMax - 0.4) - _list[k].priceStart) * 2))
+              tmp = parseFloat(_list[k].baseprice - _list[k].jfprice * (((_waterMax) - _list[k].priceStart) / 0.1))
             }
           }
           _listResult.push(tmp)
@@ -1003,11 +1100,10 @@
         let _listResult = []
         for (let i = 0; i < this.left.length; i++) {
           let _list = this.left[i].priceList
-          let tmp = ""
+          let tmp = ''
           for (let k = 0; k < _list.length; k++) {
             if (_waterMax >= _list[k].priceEnd && _waterMax < _list[k].priceStart) {
-              tmp = parseFloat(_list[k].baseprice + _list[k].jfprice * ((_list[k].priceStart - (_waterMax + 0.1)) * 2 +
-                1))
+              tmp = parseFloat(_list[k].baseprice + _list[k].jfprice * ((_list[k].priceStart - (_waterMax )) / 0.1 + 1))
             }
           }
           _listResult.push(tmp)
@@ -1032,7 +1128,7 @@
             if (_detailList[k] == this.baseInfoForm.waterMin) {
               _obj = {
                 type: 1,
-                name: "干粮",
+                name: '干粮',
                 water: _detailList[k],
                 isWrite: false
               }
@@ -1040,24 +1136,24 @@
             } else if (_detailList[k] == this.baseInfoForm.waterMax) {
               _obj = {
                 type: 3,
-                name: "上限",
+                name: '上限',
                 water: _detailList[k],
                 isWrite: false
               }
             } else if (_detailList[k] == this.baseInfoForm.waterBase) {
               _obj = {
                 type: 2,
-                name: "基准",
+                name: '基准',
                 water: _detailList[k],
                 isWrite: false
               }
             } else {
               _obj = {
-                name: "分界",
+                name: '分界',
                 water: _detailList[k],
                 type: 5,
                 index: k,
-                isWrite: false
+                isWrite: true
               }
 
             }
@@ -1372,4 +1468,10 @@
     justify-content: space-around;
     align-items: center;
   }
+  .white-bgc{
+    background: white!important;
+  }
+  #aaa::selection{
+    // background: red;
+  }
 </style>

src/views/houseSelfCollect/component/inspectInfoPrint.vue

@@ -37,7 +37,8 @@
         <td class="col col-bgc">热损伤（%）</td>
         <td class="col">{{ printData.jiaorenli }}</td>
         <td class="col col-bgc">单价（元/公斤）</td>
-        <td class="col">{{ printData.tidalGrainPrice }}</td>
+        <td v-if="printData.type == '潮粮'" class="col">{{ printData.tidalGrainPrice }}</td>
+        <td v-else class="col">{{ printData.dryGrainPrice }}</td>
       </tr>
       <tr class="row">
         <td class="col col-bgc">杂质（%）</td>

src/views/houseSelfCollect/component/paymentPrint.vue

@@ -66,7 +66,8 @@
       </tr>
       <tr class="row">
         <td class="col col-bgc"  v-if="printData.type == '潮粮'">净重单价</td>
-         <td class="col col-bgc" v-if="printData.type == '干粮'">单价</td>
+        <td class="col col-bgc" v-if="printData.type == '干粮'">单价</td>
+        <td class="col col-bgc">扣单价</td>
         <td class="col col-bgc">粮款</td>
         <td class="col col-bgc">称重补助</td>
         <td class="col col-bgc">运费补助</td>
@@ -80,6 +81,7 @@
       <tr class="row">
         <td class="col " v-if="printData.type == '潮粮'">{{printData.tidalGrainPrice}}</td>
         <td class="col " v-if="printData.type == '干粮'">{{printData.qualityInspectionManagement.dryGrainPrice}}</td>
+        <td class="col ">{{ printData.qualityInspectionManagement.unitDeduction}}</td>
         <td class="col ">{{ printData.grainMoney}}</td>
         <td class="col ">{{ printData.weighingSubsidy}}</td>
         <td class="col ">{{ printData.freightSubsidy}}</td>
@@ -147,7 +149,7 @@
       printData: {
         type: Object
       },
-      billingDate:"",
+      billingDate:'',
     },
     data() {
       return {

src/views/houseSelfCollect/customerManagementAdd.vue

@@ -157,7 +157,7 @@
         identityLow: 'low',
         bankUps: 'bankUp',
         bankLows: 'bankLow',
-        sendText: '',
+        sendText: '60S后重发',
         sendDisabled: false,
         verifyCode: "",
         bankList:[],
@@ -268,6 +268,8 @@
 
       },
       cancel() {
+        this.customerList = {}
+        this.verifyCode = ""
         this.$router.push({
           path: 'customerManagement'
         })
@@ -360,13 +362,6 @@
           })
           return
         }
-        //   if (!this.imageUrl2) {
-        //   this.$message({
-        //     message: '请上传身份证反面',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
           if (!this.imageUrl3) {
           this.$message({
             message: '请上传银行卡正面',
@@ -374,13 +369,6 @@
           })
           return
         }
-        //   if (!this.imageUrl4) {
-        //   this.$message({
-        //     message: '请上传银行卡反面',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
         if (!this.customerList.customerName) {
           this.$message({
             message: '请输入姓名',
@@ -409,20 +397,6 @@
           })
           return
         }
-        //  if (!this.customerList.payeeName) {
-        //   this.$message({
-        //     message: '请输入收款人姓名',
-        //     type: 'warning',
-        //   })
-        //   return
-        // } 
-        //  if (!this.customerList.payeeNumberCard) {
-        //   this.$message({
-        //     message: '请输入收款人身份证号',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
          if (this.customerList.payeeNumberCard.length != 18) {
           this.$message({
             message: '收款人身份证号输入有误，请重新输入',
@@ -444,13 +418,6 @@
           })
           return
         }
-        // if (!this.customerList.compAddress) {
-        //   this.$message({
-        //     message: '请输入联系地址',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
         // 验证码校验
         GetCustomerCodeJY({
             phone: this.customerList.customerPhone,
@@ -473,13 +440,9 @@
                   customerAdd(this.customerList)
                     .toPromise()
                     .then((response) => {
-                      // this.customerList.id = response
-                      // customerIdentity(this.customerList)
-                      //   .toPromise()
-                      //   .then((response) => {
-                      //     this.$message.success('添加成功')
-                      //     this.$router.push({ path: 'customerManagement' })
-                      //   })
+                      this.$message.success('添加成功')
+                      this.customerList = {}
+                      this.verifyCode = ""
                       this.$router.go(-1)
                     })
                 })
@@ -497,6 +460,8 @@
                     .toPromise()
                     .then((response) => {
                       this.$message.success('修改成功')
+                         this.customerList = {}
+                         this.verifyCode = ""
                       this.$router.push({
                         path: 'customerManagement'
                       })
@@ -517,11 +482,7 @@
           .then((response) => {
             this.customerList = response
             this.identity = this.customerList.cardAddressUrl.split(',')
-            // this.identityImgUp[0].url = this.identity[0]
-            // this.identityImgLow[0].url = this.identity[1]
             this.bank = this.customerList.payeeAddressUrl.split(',')
-            // this.bankImgUp[0].url = this.bank[0]
-            // this.bankImgLow[0].url = this.bank[1]
             this.imageUrl1 = this.identity[0]
             this.imageUrl2 = this.identity[1]
             this.imageUrl3 = this.bank[0]

src/views/houseSelfCollect/inspectInfo.vue

@@ -28,10 +28,10 @@
               </ws-select>
             </ws-form-item>
             <ws-form-item label="客户" span="1" prop="customerName">
-              <ws-select v-model="inspect.customerName" placeholder="" class="typeselect" @change="customerChange"
+              <el-select v-model="inspect.customerName" clearable filterable  placeholder="请选择" class="typeselect" @change="customerChange"
                 :disabled="disabled1">
-                <ws-option v-for="item in customerList" :key="item.valueKey" :label="item.value" :value="item.value" />
-              </ws-select>
+                <el-option v-for="item in customerList" :key="item.valueKey" :label="item.value" :value="item.value" />
+              </el-select>
             </ws-form-item>
             <ws-form-item label="囤位号" span="1" prop="storageTagNo">
               <ws-input v-model="inspect.storageTagNo" placeholder="请输入囤位号" maxlength="15" size="small"
@@ -90,7 +90,7 @@
               <ws-input v-model="inspect.mildewGrain" placeholder="请输入霉变粒占比" maxlength="100" size="small"
                 :disabled="disabled" />
             </ws-form-item>
-            <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
+            <ws-form-item label="容重(克/升)" span="1" prop="bulkDensity">
               <ws-input v-model="inspect.bulkDensity" placeholder="请输入容重" maxlength="100" size="small"
                 :disabled="disabled" />
             </ws-form-item>
@@ -111,7 +111,7 @@
         </div>
       </ws-form> 
     </div>
-    <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食质检单" @close="closeDialog">
+    <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食质检单" @close="closeDialog" :close-on-click-modal="false">
         <inspectInfoPrint :printData="inspect" ref="saveImg"></inspectInfoPrint>
         <div style="text-align:center">
           <el-button type="primary" @click="closePrint">关闭</el-button>
@@ -255,7 +255,11 @@
             })
             this.dialogTableVisible = true;
           }
-        });
+        })
+        this.types = ""
+        // this.inspect = [] 
+        this.isShowPrint = false
+        this.$router.push({path:'inspectionManagement'})
       },
       typeChange(){
         if(this.inspect.type == "干粮" && this.inspect.goodsName){

src/views/houseSelfCollect/inspectionManagement.vue

@@ -72,7 +72,12 @@
         prop="tidalGrainPrice"
         label="单价（元/公斤）"
         width="120px"
-      ></el-table-column>
+      >
+      <template scope="scope">
+          <span v-if="scope.row.type == '潮粮'">{{ scope.row.tidalGrainPrice }}</span>
+          <span v-else>{{ scope.row.dryGrainPrice }}</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="binNumber" label="仓位号"></el-table-column>
       <el-table-column prop="storageTagNo" label="囤位号"></el-table-column>
       <el-table-column prop="qualityInspector" label="质检员"></el-table-column>
@@ -169,6 +174,11 @@ export default {
       this.getList()
     },
     inspectInfo(row, index) {
+      for(let i = 0 ; i < this.warehouseList.length ; i++){
+        if(this.WAREHOUSE[1].payname == this.warehouseList[i].value){
+          this.cangid = this.warehouseList[i].id
+        }
+      }
       //添加,编辑，查看
       this.$router.push({
         path: 'inspectInfo',
@@ -250,10 +260,10 @@ export default {
             })
           }
           if(this.warehouseList.length > 0){
-            this.warehouseName =  this.warehouseList[0].value
+            this.warehouseName = this.warehouseList[0].value
              if (this.cangid) {
             this.warehouseName = this.WAREHOUSE[1].payname
-          } 
+               } 
           else {
             this.WAREHOUSE[1].payname = this.warehouseList[0].value
           }
@@ -264,7 +274,6 @@ export default {
             this.getList()
           }
         })
-
     },
     getList() {
       getinspectList({

src/views/houseSelfCollect/paymentManagement.vue

@@ -4,11 +4,11 @@
     <BaseHeaderLayout :leftSpan="16">
       <template slot="left">
         <ws-button type="primary" @click="screen(2)">待结算</ws-button>
-        <ws-button type="primary" @click="screen()">待审核</ws-button>
+        <ws-button type="primary" @click="screen(0)">待审核</ws-button>
         <ws-button type="primary"  @click="screen()">全部</ws-button>
         <ws-button type="primary" @click="reject" v-if="isShowAdopt">驳回</ws-button>
         <ws-button type="primary" @click="adopt" v-if="isShowAdopt">通过</ws-button>
-        <ws-button type="primary" @click="handlepass" v-if="isShowAdopt">审核</ws-button>
+        <!-- <ws-button type="primary" @click="handlepass" v-if="isShowAdopt">审核</ws-button> -->
         <ws-button type="primary" @click="payment" v-hasPermission="`acquisitionManagement.acquisitionPay.pay`">付款</ws-button>
       </template>
       <template slot="right">
@@ -70,11 +70,16 @@
       <el-table-column class="table_td" prop="goodsName" label="货名"></el-table-column>
       <el-table-column class="table_td" width="80" prop="type" label="类型"></el-table-column>
       <el-table-column class="table_td" prop="tidalGrainPrice" width="140" label="净重单价（元/公斤）"></el-table-column>
+      <el-table-column class="table_td" prop="unitDeduction" width="130" label="扣单价（元/公斤）"></el-table-column>
       <el-table-column class="table_td" prop="solidGrainPrice" width="140" label="纯重单价（元/公斤）"></el-table-column>
       <el-table-column class="table_td" prop="netWeight" width="120" label="净重（公斤）"></el-table-column>
       <el-table-column class="table_td" prop="pureWeight" width="120" label="纯重（公斤）"></el-table-column>
       <el-table-column class="table_td" prop="amountIngPayable" label="应付款(元)"></el-table-column>
-      <el-table-column class="table_td" prop="amountEdPayable" label="已付款(元)"></el-table-column>
+      <el-table-column class="table_td" prop="amountEdPayable" label="已付款(元)">
+        <template slot-scope="scope">
+          <div @click="showPayImg(scope.row)">{{scope.row.amountEdPayable}}</div>
+        </template>
+      </el-table-column>
       <el-table-column class="table_td" prop="updateDate" label="更新时间" width="140" ></el-table-column>
       <el-table-column class="table_td" prop="status" label="状态">
         <template scope="scope">
@@ -88,12 +93,7 @@
       </el-table-column>
       <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="350">
         <template scope="scope">
-          <el-button
-            type="danger"
-            v-if="(!scope.row.approveStatus || scope.row.approveStatus == '待结算')&& scope.row.status == '待结算'"
-            @click="del(scope.row)"
-            v-hasPermission="`acquisitionManagement.acquisitionPay.delete`"
-          >删除</el-button>
+          
           <el-button
             v-if="(!scope.row.approveStatus || scope.row.approveStatus == '待结算')&& scope.row.status == '待结算'"
             @click="settlement(1, scope.row)"
@@ -109,6 +109,12 @@
             @click="print(scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.print`"
           >打印</el-button>
+          <el-button
+            type="danger"
+            v-if="(!scope.row.approveStatus || scope.row.approveStatus == '待结算')&& scope.row.status == '待结算'"
+            @click="del(scope.row)"
+            v-hasPermission="`acquisitionManagement.acquisitionPay.delete`"
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -149,6 +155,15 @@
         </ws-form>
       </div>
     </el-dialog>
+    <!-- 付款截图 -->
+     <el-dialog width="50%" :visible.sync="showPayImgs" :append-to-body="true" title="付款截图">
+       <div v-for="(item,index) in payImg" :key="index" class="pay_img">
+         <img :src="item" alt="" class="img">
+       </div>
+       <div style="text-align:center;margin:10px auto;">
+       <el-button @click="showPayImgs = false" type="primary">关闭</el-button>
+       </div>
+     </el-dialog>
     <div style="text-align: center">
       <el-pagination
         @size-change="handleSizeChange"
@@ -215,9 +230,11 @@ export default {
         amountNotPayable: 0,
         paymentDate: ''
       },
+      showPayImgs:false,
       isShowAdopt:false,
       //上传截图路径
-      imageUrl: ''
+      imageUrl: '',
+      payImg:[],
     }
   },
   activated() {
@@ -241,6 +258,19 @@ export default {
       }
       
     },
+    //查看付款截图
+    showPayImg(row){
+      if(!row.paymentScreenshot){
+         this.$message({
+          message: '暂无付款截图！',
+          type: 'warning'
+        })
+        return
+      }else{
+        this.showPayImgs = true
+        this.payImg = row.paymentScreenshot.split('$')
+      }
+    },
     getWarehouse() {
       selectWarehouseSelf({
         compId: sessionStorage.getItem('ws-pf_compId')
@@ -291,21 +321,21 @@ export default {
           this.deptBudgetTotal = response.total
         })
         this.isShowAdopt = true
-     getpayment({
-         currentPage: 1,
-        pageSize: 99999,
-        warehouseName: this.warehouseName,
-        managementType : 1 
-      })
-        .toPromise()
-        .then((response) => {
-          for(let i = 0 ; i < response.length ; i++){
-            if(response[i].taskId){
-              this.isShowAdopt = true
-              return
-            }
-          }
-        })
+    //  getpayment({
+    //      currentPage: 1,
+    //     pageSize: 99999,
+    //     warehouseName: this.warehouseName,
+    //     managementType : 1 
+    //   })
+    //     .toPromise()
+    //     .then((response) => {
+    //       for(let i = 0 ; i < response.length ; i++){
+    //         if(response[i].taskId){
+    //           this.isShowAdopt = true
+    //           return
+    //         }
+    //       }
+    //     })
     },
     del(row) {
       this.$confirm(
@@ -682,4 +712,13 @@ table {
   border-radius: 5px;
   display: block;
 }
+.pay_img{
+width:50%;
+// display: flex;
+display: inline-block;
+.img{
+  height: 350px;
+  width: 100%;
+}
+}
 </style>

src/views/houseSelfCollect/settlement.vue

@@ -200,6 +200,9 @@
             <ws-form-item v-if='paymentList.type=="潮粮"' label="扣杂（公斤）" span="1" prop="waterContent">
               <ws-input v-model="paymentList.weighingManagement.buckleMiscellaneous" placeholder="请输入扣杂" maxlength="100" size="small" disabled/>
             </ws-form-item>
+            <ws-form-item  label="扣单价（元/公斤）" span="1" prop="unitDeduction">
+              <ws-input v-model="paymentList.unitDeduction" placeholder="请输入扣单价" maxlength="100" size="small" :disabled="disabled"/>
+            </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮"'
               label="纯重单价（元/公斤）"
               span="1"
@@ -222,7 +225,7 @@
           <div class="titles">结算金额（元）</div>
           <ws-info-table>
             <ws-form-item v-if='paymentList.type=="潮粮"'
-              label="粮款 = 净重 x 净重单价 ="
+              label="粮款 = 净重 x (净重单价 - 扣单价) ="
               span="1"
               prop="waterContent"
               class="formItem"
@@ -230,7 +233,7 @@
               <ws-input @input='grainMoney' v-model="paymentList.grainMoney" placeholder="请输入粮款" maxlength="100" size="small" disabled/>
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="干粮"' 
-              label="粮款 = 净重 x  干粮单价 ="
+              label="粮款 = 净重 x  (干粮单价 - 扣单价)  ="
               span="1"
               prop="waterContent"
               class="formItem"
@@ -240,6 +243,7 @@
             <ws-form-item label="称重扣款" span="1" prop="waterContent">
               <ws-input
               @input='grainMoney'
+              @focus="inputFocus($event)"
               v-model="paymentList.weighingDeduction"
                 placeholder="请输入称重扣款"
                 maxlength="100"
@@ -250,6 +254,7 @@
             <ws-form-item label="称重补助" span="1" prop="waterContent">
               <ws-input
               @input='grainMoney'
+              @focus="inputFocus($event)"
                v-model="paymentList.weighingSubsidy"
                 placeholder="请输入称重补助"
                 maxlength="100"
@@ -261,6 +266,7 @@
             <ws-form-item label="运费扣款" span="1" prop="waterContent">
               <ws-input
               @input='grainMoney'
+              @focus="inputFocus($event)"
                v-model="paymentList.freightDeduction"
                 placeholder="请输入运费扣款"
                 maxlength="100"
@@ -271,6 +277,7 @@
             <ws-form-item label="运费补助" span="1" prop="waterContent">
               <ws-input
               @input='grainMoney'
+              @focus="inputFocus($event)"
               v-model="paymentList.freightSubsidy"
                 placeholder="请输入运费补助"
                 maxlength="100"
@@ -281,6 +288,7 @@
             <ws-form-item label="卸车扣款" span="1" prop="waterContent">
               <ws-input
               @input='grainMoney'
+              @focus="inputFocus($event)"
               v-model="paymentList.unloadDeduction"
                 placeholder="请输入卸车扣款"
                 maxlength="100"
@@ -291,6 +299,7 @@
             <ws-form-item label="卸车补助" span="1" prop="waterContent">
               <ws-input
               @input='grainMoney'
+              @focus="inputFocus($event)"
               v-model="paymentList.unloadSubsidy"
                 placeholder="请输入卸车补助"
                 maxlength="100"
@@ -301,6 +310,7 @@
             <ws-form-item label="质量扣款" span="1" prop="qualityDeduction">
               <ws-input
               @input='grainMoney'
+              @focus="inputFocus($event)"
               v-model="paymentList.qualityDeduction"
                 placeholder="请输入质量扣款"
                 maxlength="100"
@@ -312,6 +322,7 @@
             <ws-form-item label="其他补助" span="1" prop="waterContent">
               <ws-input
               @input='grainMoney'
+              @focus="inputFocus($event)"
               v-model="paymentList.otherSubsidy"
                 placeholder="请输入其他补助"
                 maxlength="100"
@@ -323,6 +334,7 @@
             <ws-form-item label="其他扣款" span="1" prop="waterContent">
               <ws-input
               @input='grainMoney'
+              @focus="inputFocus($event)"
               v-model="paymentList.otherDeduction"
                 placeholder="请输入其他扣款"
                 maxlength="100"
@@ -388,6 +400,7 @@
       :visible.sync="isShowPrint"
       title="中天昊元粮食贸易有限公司结算凭证"
        @close="closeDialog"
+       :modal-append-to-body = "false"
     >
       <paymentPrint :printData="printData" ref="saveImg"></paymentPrint>
       <div style="text-align:center">
@@ -401,8 +414,8 @@
 <script>
 import {getpaymentexamine,postpaymentedit,settlementEdit} from '@/model/houseSelfCollect/index'
 import paymentPrint from './component/paymentPrint.vue'
-import html2canvas from "html2canvas"
-import axios from "axios"
+import html2canvas from 'html2canvas'
+import axios from 'axios'
 export default {
   components: {
     paymentPrint
@@ -416,14 +429,15 @@ export default {
          buckleWeightRatio:0,
          grainMoney:0,
          waterMin:0,
-       }
+       },
+       unitDeduction:0
      },
       disabled:false,
       types:'',
       isShowPrint:false,
       information:'结算',
       printData:{},
-      imgUrl:"",
+      imgUrl:'',
     }
   },
   activated() {
@@ -438,6 +452,9 @@ export default {
    this.getList()
   },
   methods: {
+    inputFocus(event){
+      event.currentTarget.select()
+    },
     closeDialog(){
       html2canvas(this.$refs.saveImg.$el).then((canvas) => {
         let dataURL = canvas.toDataURL('image/png')
@@ -458,8 +475,12 @@ export default {
               .then((response) => {})
           })
           this.dialogTableVisible = true
+          
         }
       })
+      this.paymentList = [] 
+      this.isShowPrint = false
+      this.$router.push({path:'paymentManagement'})
     },
     printSmall() {
       window.open('../../../../../static/payprint.html?type=1&dataList=' +JSON.stringify(this.printData))
@@ -470,6 +491,9 @@ export default {
     getList(){
       getpaymentexamine({id:this.$route.query.id}).toPromise().then((response) => {
           this.paymentList = response
+          if(!this.paymentList.unitDeduction){
+            this.paymentList.unitDeduction = 0
+          } 
           this.paymentList.buckleWeightRatio = this.paymentList.qualityInspectionManagement.buckleWeightRatio
           this.paymentList.tidalGrainPrice = this.paymentList.tidalGrainPrice.toFixed(2)
           this.paymentList.qualityInspectionManagement.waterMin=this.$route.query.waterMin
@@ -479,19 +503,18 @@ export default {
          this.paymentList.base = this.paymentList.base.toFixed(2)
           this.paymentList.pureWeight=this.paymentList.base*this.paymentList.weighingManagement.netWeight
            this.paymentList.pureWeight =  this.paymentList.pureWeight.toFixed(2)
-          if(!this.paymentList.solidGrainPrice){
-            this.paymentList.solidGrainPrice=this.paymentList.qualityInspectionManagement.tidalGrainPrice/this.paymentList.base
+          if(!this.paymentList.dryGrainPrice){
+            this.paymentList.dryGrainPrice=this.paymentList.qualityInspectionManagement.tidalGrainPrice/this.paymentList.base
           }
           if(this.paymentList.type =='潮粮'){
-            this.paymentList.grainMoney=this.paymentList.qualityInspectionManagement.tidalGrainPrice*this.paymentList.weighingManagement.netWeight
+            this.paymentList.grainMoney=(this.paymentList.qualityInspectionManagement.tidalGrainPrice - this.paymentList.unitDeduction)*this.paymentList.weighingManagement.netWeight
             this.paymentList.calculationPayable=Number(this.paymentList.grainMoney)+Number(this.paymentList.weighingSubsidy)+Number(this.paymentList.freightSubsidy)+Number(this.paymentList.unloadSubsidy)+Number(this.paymentList.otherSubsidy)-Number(this.paymentList.weighingDeduction)-this.paymentList.freightDeduction-Number(this.paymentList.unloadDeduction)-Number(this.paymentList.otherDeduction)-Number(this.paymentList.qualityDeduction)
             this.paymentList.calculationPayable =  this.paymentList.calculationPayable.toFixed(2)
       
               this.paymentList.actualPayment = this.paymentList.calculationPayable
               this.actualPayment( this.paymentList.actualPayment)
           }else{
-            
-            this.paymentList.grainMoney=this.paymentList.qualityInspectionManagement.dryGrainPrice * this.paymentList.netWeight
+            this.paymentList.grainMoney=(this.paymentList.qualityInspectionManagement.dryGrainPrice - this.paymentList.unitDeduction)*this.paymentList.weighingManagement.netWeight
              this.paymentList.calculationPayable=Number(this.paymentList.grainMoney)+Number(this.paymentList.weighingSubsidy)+Number(this.paymentList.freightSubsidy)+Number(this.paymentList.unloadSubsidy)+Number(this.paymentList.otherSubsidy)-Number(this.paymentList.weighingDeduction)-this.paymentList.freightDeduction-Number(this.paymentList.unloadDeduction)-Number(this.paymentList.otherDeduction)-Number(this.paymentList.qualityDeduction)
               this.paymentList.calculationPayable =  this.paymentList.calculationPayable.toFixed(2)
                 this.paymentList.actualPayment = this.paymentList.calculationPayable
@@ -604,7 +627,7 @@ export default {
           return chineseStr;
         },
     print() {
-      if(this.paymentList.type == "潮粮"){
+      if(this.paymentList.type == '潮粮'){
         if (!this.paymentList.buckleWeightRatio) {
           this.$message({
             message: '扣重比不能为空',
@@ -712,8 +735,6 @@ export default {
       postpaymentedit(this.paymentList).toPromise().then((response) => {
          getpaymentexamine({id:this.$route.query.id}).toPromise().then((response) => {
              this.printData= response
-          let date = new Date()
-          this.printData.currentTime =  date.getFullYear() +  '年' + '月' +  date.getDate() + '日'
          })
          this.isShowPrint = true
         },
@@ -796,7 +817,7 @@ export default {
   width: 70% !important;
 }
 /deep/.ws-info-table .formItem .el-form-item__label{
-  width: 220px;
+  width: 260px;
 }
 /deep/.el-table .el-table__header .cell,
 .el-table .el-table__body .cell {

src/views/houseSelfCollect/weighingManagement.vue

@@ -199,6 +199,8 @@ export default {
          this.purchasePriceList = this.warehouseList[i].warehouseList
           this.allowEdit = this.warehouseList[i].allowEdit
             this.WAREHOUSE[2].payname = this.warehouseList[i].value
+             this.common.name  =  this.warehouseList[0].value
+            sessionStorage.setItem('ck',e)
         }
       }
       this.getList()
@@ -253,7 +255,7 @@ export default {
               allowEdit:response[i].allowEdit
             })
           }
-                this.warehouseName =  this.warehouseList[0].value
+          this.warehouseName =  this.warehouseList[0].value
              if (this.warehouseId) {
             this.warehouseName = this.WAREHOUSE[2].payname
           } else {
@@ -262,11 +264,13 @@ export default {
           this.allowEdit = this.warehouseList[0].allowEdit
           this.warehouseId = this.warehouseList[0].warehouseId
           this.purchasePriceList = this.warehouseList[0].warehouseList
+           this.common.name  =  this.warehouseList[0].value
+           sessionStorage.setItem('ck',this.common.name)
          this.getList()
         })
     },
     getList() {
-          getweighingList({
+        getweighingList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
@@ -286,7 +290,7 @@ export default {
             }else{
               response.records[i].allow = 1
             }  
-          }debugger
+          }
           this.weighingList = response.records
           this.common.commonWeighingList  = response.records
           this.deptBudgetTotal = response.total

src/views/outboundManagement/collectionManagement.vue

@@ -149,7 +149,11 @@
         class="table_td"
         prop="amountEdCollectionable"
         label="已收款(元)"
-      ></el-table-column>
+      >
+      <template slot-scope="scope">
+        <div @click="cellClick(scope.row)">{{scope.row.amountEdCollectionable}}</div>
+      </template>
+      </el-table-column>
       <el-table-column
         class="table_td"
         prop="collectionDate"
@@ -170,6 +174,11 @@
         </template>
       </el-table-column>
     </el-table>
+    <el-dialog :visible.sync="isShowImgList" title="收款截图">
+     <div v-for="(item,index) in imgList" :key="index"  class="imgList-style">
+       <img :src="item" alt="" class="img">
+     </div>
+    </el-dialog>
     <!-- 收款 -->
     <el-dialog
       width="25%"
@@ -275,6 +284,8 @@ export default {
   watch: {},
   data() {
     return {
+      imgList:[],
+      isShowImgList:false,
       //分页
       currentPage: 1,
       pageSize: 10,
@@ -323,6 +334,15 @@ export default {
     this.getList()
   },
   methods: {
+    cellClick(row){
+      this.imgList = row.collectionScreenshot.split('$')
+      this.isShowImgList = true
+      // console.log(val)
+      //  console.log(val2)
+      //   console.log(val3)
+      //    console.log(event)
+      console.log(row)
+    },
     contractchange(e) {
       this.contractNo = e
       this.getList()
@@ -520,9 +540,10 @@ export default {
       }).toPromise().then((response) => {
           for (var i = 0; i < response.records.length; i++) {
             response.records[i].identification = 'false'
-            response.records[i].contractPrice =  response.records[i].contractPrice/1000
+            response.records[i].contractPrice =  response.records[i].contractPrice*1000
           }
            this.collectList = response.records
+           this.deptBudgetTotal = response.total
         })
       contractList({
         compId: sessionStorage.getItem('ws-pf_compId'),
@@ -616,5 +637,13 @@ export default {
     font-size: 13px;
     margin-left: -67px;
 }
+.imgList-style{
+  width: 50%;
+  display: inline-block;
+  .img{
+    width: 100%;
+    height: 300px;
+  }
+}
 </style>
 

src/views/outboundManagement/collectionment.vue

@@ -60,7 +60,7 @@
             </ws-form-item>
             <ws-form-item label="单价(元/公斤)" span="1" prop="contractPrice">
               <ws-input 
-              v-model="collectionList.weighingManagement.contractPrice" placeholder="请输入单价" maxlength="100" size="small" disabled/>
+              v-model="collectionList.weighingManagement.contractPrice*1000" placeholder="请输入单价" maxlength="100" size="small" disabled/>
             </ws-form-item>
             <ws-form-item label="车牌号" span="1" prop="carNo">
               <ws-input 

src/views/outboundManagement/qualityInspectionManagement.vue

@@ -110,7 +110,8 @@ export default {
     }
   },
   activated() {
-    this.getList()
+    this.selectWarehouse()
+		this.showType = this.isShow
   },
   methods: {
     find(){
@@ -127,7 +128,12 @@ export default {
       })
     },
     selecttaskType(e) {
-      console.log(e)
+      for (let i = 0; i < this.warehouseList.length; i++) {
+					if (this.warehouseList[i].value == e) {
+						this.cangid = this.warehouseList[i].cangid
+					}
+				}
+				this.getList()
     },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`)
@@ -139,8 +145,8 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
-    getList() {
-      selectWarehouseSelf({
+  selectWarehouse(){
+    selectWarehouseSelf({
         compId: sessionStorage.getItem('ws-pf_compId'),
       })
         .toPromise()
@@ -148,15 +154,16 @@ export default {
           this.warehouseList = []
           for (let i = 0; i < response.length; i++) {
             this.warehouseList.push({
-              // valueKey: i,
               value: response[i].warehouseName,
-              id: response[i].id,
+              warehouseId: response[i].id,
             })
           }
           this.warehouseName = response[0].warehouseName
           this.cangid = response[0].id
+          this.getList()
         })
-
+    },
+    getList() {
       getinspectList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
@@ -167,18 +174,7 @@ export default {
       })
         .toPromise()
         .then((response) => {
-          // for (let i = 0; i < response.length; i++) {
-          //   this.warehouseList.push({
-          //     valueKey: i,
-          //     value: response[i].warehouseName,
-          //     id:response[i].id
-          //   })
-          // }
-          // this.searchTypeText = response[0].warehouseName
-          // this.id = response[0].id
-          // console.log(response)
           this.inspect = response.records
-          console.log(this.inspect,'容重')
           this.deptBudgetTotal = response.total
         })
     },

src/views/outboundManagement/weighing.vue

@@ -48,14 +48,15 @@
 						</ws-form-item>
 						<ws-form-item label="毛重（公斤）" span="1" prop="grossWeight" v-if="this.types == 1">
 							<ws-input v-model="weighingList.grossWeight" @input="calculation" placeholder="未获取到毛重"
-								maxlength="100" size="small" :disabled="disabled2" />
+								maxlength="100" size="small"  />
 						</ws-form-item>
 						<el-button type="primary" v-if="this.types == 1" @click="openPort">重新获取</el-button>
 
 						<ws-form-item label="皮重（公斤）" span="1" prop="tare">
 							<!-- <ws-input v-model="weighingList.tare" placeholder="未获取到皮重" maxlength="100" size="small"
 								disabled /> -->
-								<ws-input @input="calculation" v-model="weighingList.tare" placeholder="未获取到皮重" maxlength="100" size="small" />
+								<ws-input @input="calculation" v-model="weighingList.tare" placeholder="未获取到皮重" 
+								maxlength="100" size="small" :disabled="disabled2"/>
 						</ws-form-item>
 						<el-button type="primary" v-if="this.types == 2 || this.types == null" @click="openPort">重新获取</el-button>
 						<!-- <div class="formItem"> -->
@@ -167,10 +168,13 @@
 				this.information = '毛重'
 				this.disabled = true
 				this.disabled1 = true
+				this.disabled2 = true
 			} else if (this.types == 2) {
 				this.information = '编辑皮重'
 				this.disabled1 = true
 				this.disabled2 = true
+			} else {
+				this.disabled2 = true
 			}
 			this.getList(id)
 		},
@@ -396,6 +400,13 @@
 						})
 						return
 					}
+					if (this.weighingList.netWeight < 0){
+						this.$message({
+							message: '净重不能为负',
+							type: 'warning',
+						})
+						return
+					}
 				}
 				this.weighingList.warehouseName = this.warehouseName
 				this.weighingList.secretaryWeigher = sessionStorage.getItem('ws-pf_staffName')

src/views/purchasingManagement/procurementPlanAdd.vue

@@ -868,8 +868,8 @@ return Num
               this.dataList.receivePrivate =  CodeToText[this.selectedOptions[0]]
               this.dataList.receiveCity = CodeToText[this.selectedOptions[1]]
               this.dataList.receiveArea = CodeToText[this.selectedOptions[2]]
-              this.dataList.outputPrivate =
-                CodeToText[this.selectedOptions1[0]]
+              this.dataList.outputPrivate = CodeToText[this.selectedOptions1[0]]
+               this.dataList.outputCity = CodeToText[this.selectedOptions1[1]]
               // this.dataList.outputCity = CodeToText[this.selectedOptions1[1]]
               // if(this.dataList.procurementPlanType=='期货'){
               //   this.dataList.basisPrice='-'+Math.abs(this.dataList.basisPrice)

src/views/purchasingManagement/procurementPlanEdit.vue

@@ -627,6 +627,7 @@ export default {
           this.selectedOptions = tmp
           var tmp1 = []
           tmp1[0] = TextToCode[this.dataList.outputPrivate].code
+          tmp1[1] = TextToCode[this.dataList.outputPrivate][this.dataList.outputCity].code
           // tmp1[1] = TextToCode[this.dataList.outputPrivate][this.dataList.outputCity].code
           this.selectedOptions1 = tmp1
         })
@@ -895,6 +896,7 @@ export default {
               this.dataList.receiveCity = CodeToText[this.selectedOptions[1]]
               this.dataList.receiveArea = CodeToText[this.selectedOptions[2]]
               this.dataList.outputPrivate = CodeToText[this.selectedOptions1[0]]
+              this.dataList.outputCity = CodeToText[this.selectedOptions1[1]]
               // this.dataList.outputCity = CodeToText[this.selectedOptions1[1]]
               // if(this.dataList.procurementPlanType=='期货'){
               //   this.dataList.basisPrice='-'+Math.abs(this.dataList.basisPrice)

src/views/purchasingManagement/procurementPlanLook.vue

@@ -165,11 +165,7 @@ import {
 
   procurementLook,
 } from '@/model/purchasingManagement/index'
-import { packList } from '@/model/contarct/index'
-import { pullDown, getstaff } from '@/model/warehouse/index'
-import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
-import { mapActions, mapGetters, mapState } from 'vuex'
 import WsUpload from '@/components/WsUpload'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
 import { dayjs, EventBus } from 'base-core-lib'

src/views/salesManagement/salesPlanLook.vue

@@ -164,11 +164,7 @@
 import {
   saleLook,
 } from '@/model/salesManagement/index'
-import { packList } from '@/model/contarct/index'
-import { pullDown, getstaff } from '@/model/warehouse/index'
-import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
-import { mapActions, mapGetters, mapState } from 'vuex'
 import WsUpload from '@/components/WsUpload'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
 import { dayjs, EventBus } from 'base-core-lib'

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -27,7 +27,7 @@
           <ws-button
             type="primary"
             v-hasPermission="`report.procurementInReport.view`"
-            @click="handlepass()"
+            @click="handleAudit()"
             >通过</ws-button
           >
           <ws-button
@@ -100,8 +100,8 @@
         >
         <span v-else>合同重量: 0 吨</span>
 
-        <span v-if="warehouseList.settlementWeight"
-          >入库量: {{ warehouseList.settlementWeight }} 吨</span
+        <span v-if="settlementWeight1"
+          >入库量: {{ settlementWeight1 }} 吨</span
         >
         <span v-else>入库量: 0 吨</span>
 
@@ -377,6 +377,7 @@
             class="deal"
             placeholder="输入定金金额"
           ></el-input>
+          
         </el-form-item>
         <el-form-item label="上传定金截图" :label-width="formLabelWidth">
           <el-upload
@@ -406,7 +407,6 @@ import {
   addDisOrRemarks,
   stockPurchasePayMoney,
 } from '@/model/statisticalReport/index'
-import { posthandle } from '@/model/purchasingManagement/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -493,11 +493,12 @@ export default {
       payedMoney:'',
       payNotMoney:'',
       settlementWeight: '',
+      settlementWeight1: '',
       modification: [],
       contractManagementInfoList: {},
       contractManagementInfo: {
         contractManagementInfoList: [],
-        deposit: '0',
+        deposit: '',
         depositUrl: '',
         remark: '',
         id: '',
@@ -640,7 +641,8 @@ export default {
             this.contractManagementInfoList.id = this.contractNoList[i].id
           }
         }
-        this.contractManagementInfoList.deposit = this.deposit
+         this.contractManagementInfoList.deposit = this.deposit
+        // this.$set(this.contractManagementInfoList,'deposit',this.deposit)
         this.contractManagementInfoList.depositUrl = this.depositUrl
         addDisOrRemarks(this.contractManagementInfoList)
           .toPromise()
@@ -648,7 +650,7 @@ export default {
             this.$message.success('修改成功')
             this.dialogFormVisible5 = false
             this.getList()
-            this.contractManagementInfoList = {}
+            
           })
       })
     },
@@ -806,37 +808,37 @@ export default {
         })
       }
     },
-    audit(item, index, status, status2, reason) {
-      if (index < this.modification.length) {
-        posthandle({
-          taskId: item.taskId,
-          approved: status,
-          auditMind: reason != undefined ? '已驳回' : '34',
-          needReapply: status2 != undefined ? true : false,
-        })
-          .toPromise()
-          .then((response) => {
-            this.audit(
-              this.modification[index + 1],
-              index + 1,
-              status,
-              status2,
-              reason
-            )
-          })
-          .catch((req) => {
-            this.$message.warning(req.message)
-          })
-      } else {
-        if (status == true) {
-          this.$message.success('通过成功')
-          this.getList()
-        } else if (status == false) {
-          this.$message.success('驳回成功')
-          this.getList()
-        }
-      }
-    },
+    // audit(item, index, status, status2, reason) {
+    //   if (index < this.modification.length) {
+    //     posthandle({
+    //       taskId: item.taskId,
+    //       approved: status,
+    //       auditMind: reason != undefined ? '已驳回' : '34',
+    //       needReapply: status2 != undefined ? true : false,
+    //     })
+    //       .toPromise()
+    //       .then((response) => {
+    //         this.audit(
+    //           this.modification[index + 1],
+    //           index + 1,
+    //           status,
+    //           status2,
+    //           reason
+    //         )
+    //       })
+    //       .catch((req) => {
+    //         this.$message.warning(req.message)
+    //       })
+    //   } else {
+    //     if (status == true) {
+    //       this.$message.success('通过成功')
+    //       this.getList()
+    //     } else if (status == false) {
+    //       this.$message.success('驳回成功')
+    //       this.getList()
+    //     }
+    //   }
+    // },
     handlereject(status) {
       var that = this
       if (this.modification.length == 0) {
@@ -869,20 +871,6 @@ export default {
       //   this.options = this.contractNoList
       // }
     },
-    handlepass() {
-      var that = this
-      if (this.modification.length == 0) {
-        this.$message.warning('请选择要通过的条目')
-      } else {
-        this.$confirm(`是否确定通过？`, {
-          cancelButtonText: '取消',
-          confirmButtonText: '确定',
-          type: 'warning',
-        }).then(() => {
-          that.audit(this.modification[0], 0, true, 2)
-        })
-      }
-    },
     handleSelectionChange(val) {
       this.modification = val
     },
@@ -968,11 +956,13 @@ export default {
           this.payingMoney = 0
           this.payedMoney = 0
           this.payNotMoney = 0
+          this.settlementWeight1 = 0
           for (var i = 0; i < response.records.length; i++) {
             response.records[i].identification = 'false'
             this.payingMoney += response.records[i].amountIngPayable
             this.payedMoney += response.records[i].amountEdPayable
             this.payNotMoney += response.records[i].amountNotPayable
+            this.settlementWeight1 += response.records[i].settlementWeight
           }
           this.deptBudgetTotal = response.total
           this.warehouseList = response

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -36,11 +36,17 @@
 				<span v-else>合同单价: 0 元/吨</span>
 				<span v-if="amountReceivable">应收: {{ amountReceivable }} 元</span>
 				<span v-else>应收: 0 元</span>
-				<span v-if="amountReceived">已收: {{ amountReceived }} 元</span>
+				<span v-if="amountReceived">已收: {{ amountReceived }} 元
+					<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+						src="../../../public/img/fujian.png" @click="fujian1()" alt="" />
+				</span>
 				<span v-else>已收: 0 元</span>
 				<span v-if="uncollectedAmount">未收: {{ uncollectedAmount }} 元</span>
 				<span v-else>未收: 0 元</span>
-				<span v-if="orderList.deposit">定金: {{ orderList.deposit }} 元</span>
+				<span v-if="orderList.deposit">定金: {{ orderList.deposit }} 元
+					<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+						src="../../../public/img/fujian.png" @click="fujian()" alt="" />
+				</span>
 				<span v-else>定金: 0 元</span>
 			</div>
 
@@ -49,17 +55,30 @@
 				<el-table-column type="index" label="序号" width="50"></el-table-column>
 				<el-table-column class="table_td" prop="warehouseName" label="仓库"></el-table-column>
 				<el-table-column class="table_td" prop="carNo" label="车牌号"></el-table-column>
-				<el-table-column class="table_td" prop="deliveryDate" label="出库日期"></el-table-column>
+				<el-table-column class="table_td" prop="deliveryDate" label="出库日期">
+					<template slot-scope="scope">
+						<span style="color: #ce4545;" v-if="scope.row.returnFlag == 1">{{scope.row.returnDate}}</span>
+						<span v-if="scope.row.returnFlag == null">{{scope.row.deliveryDate }}</span>
+					</template>
+				</el-table-column>
 				<el-table-column class="table_td" prop="grossWeight" label="毛重(吨)"></el-table-column>
 				<el-table-column class="table_td" prop="tare" label="皮重(吨)"></el-table-column>
-				<el-table-column class="table_td" prop="netWeight" label="净重(吨)"></el-table-column>
+				<el-table-column class="table_td" prop="netWeight" label="净重(吨)">
+					<template slot-scope="scope">
+						<span style="color: #ce4545;"
+							v-if="scope.row.returnFlag == 1">-{{scope.row.netWeight}}(退)</span>
+						<span v-if="scope.row.returnFlag == null">{{scope.row.netWeight }}</span>
+					</template>
+				</el-table-column>
 				<el-table-column class="table_td" prop="settlementWeight" label="结算重量(吨)">
 					<template slot-scope="scope">
 						<div class="inputChenge">
 							<el-input v-model="scope.row.settlementWeight" v-if="scope.row.identification == 'true'">
 							</el-input>
 							<div v-if="scope.row.identification == 'false'" class="inputs">
-								{{ scope.row.settlementWeight }}
+								<span style="color: #ce4545;"
+									v-if="scope.row.returnFlag == 1">{{scope.row.settlementWeight}}</span>
+								<span v-if="scope.row.returnFlag == null">{{scope.row.settlementWeight }}</span>
 							</div>
 						</div>
 						<img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
@@ -69,14 +88,36 @@
 							v-if="scope.row.identification == 'true'" @click="weightClick(scope.row)"></i>
 					</template>
 				</el-table-column>
-				<el-table-column class="table_td" prop="amountIngReceivable" label="应收金额(元)"></el-table-column>
+				<el-table-column class="table_td" prop="amountIngReceivable" label="应收金额(元)">
+					<template slot-scope="scope">
+						<span v-if="scope.row.returnFlag == null">{{scope.row.amountIngReceivable }}</span>
+					</template>
+				</el-table-column>
 			</el-table>
 
+
 			<!-- 页数 -->
 			<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
 				:current-page="currentPage" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
 				:total="deptBudgetTotal"></el-pagination>
-			</el-scrollbar>
+		</el-scrollbar>
+		<!-- 定金弹窗 -->
+		<WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
+			@on-cancel="handleClose">
+			<div v-for="(item,index) in addressUrlArray" :key="index">
+				<img width="100" height="100" :src="item" alt="">
+			</div>
+		</WinseaContentModal>
+		<!-- 已收弹窗 -->
+		<WinseaContentModal v-model="accessoryTFs1" :title="$t('system.noticeCircular.information')"
+			@on-cancel="handleClose1">
+			<div style="display: flex;">
+				<div v-for="(item,index) in addressUrlArray1" :key="index" style="display:flex;">
+					<img width="100" height="100" :src="item" alt="">
+					<!-- <img src="https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/f43f512136a544d3bbcef0fa4259d274.png" alt=""> -->
+				</div>
+			</div>
+		</WinseaContentModal>
 		<!-- 收款 -->
 		<el-dialog width="25%" title="收款" :visible.sync="dialogFormVisible1" :append-to-body="true">
 			<el-form :model="form">
@@ -87,8 +128,8 @@
 					<el-input v-model="money" autocomplete="off" placeholder="请输入本次收款金额" class="deal"></el-input>
 				</el-form-item>
 				<el-form-item label="收款日期" prop="collectionDate" :label-width="formLabelWidth" class="deal">
-					<ws-date-picker v-model="collectionDate" type="date" placeholder="请选择收款日期"
-						value-format="yyyy-MM-dd" class="deal" />
+					<ws-date-picker v-model="collectionDate" type="date" placeholder="请选择收款日期" value-format="yyyy-MM-dd"
+						class="deal" />
 				</el-form-item>
 				<el-form-item label="上传收款截图" :label-width="formLabelWidth">
 					<el-upload action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
@@ -143,12 +184,6 @@
 		disOrRemarks,
 		saleEditSettlementWeight,
 	} from '@/model/statisticalReport/index'
-	import {
-		posthandle
-	} from '@/model/purchasingManagement/index'
-	import {
-		downloadFile
-	} from '@/utils/batchDown'
 	import Pagination from '@/components/Pagination'
 	import WsUpload from '@/components/WsUpload'
 	import {
@@ -220,7 +255,7 @@
 				amountReceivable: '',
 				amountReceived: '',
 				uncollectedAmount: '',
-				outboundVolume:'',
+				outboundVolume: '',
 				collectionDate: '',
 				collectionScreenshot: '',
 				amountEdCollectionable: '',
@@ -233,6 +268,12 @@
 				searchKeyWord: '',
 				value1: '', //收款日期
 				modification: [],
+				accessoryTFs: false,
+				appendixIdss: [],
+				accessoryTFs1: false,
+				appendixIdss1: [],
+				addressUrlArray: [],
+				addressUrlArray1: [],
 			}
 		},
 		activated() {
@@ -241,15 +282,20 @@
 		},
 		methods: {
 			//表头
-			   contractchange(e) {
-        for (var i = 0; i < this.contractNoList.length; i++) {
-          if (this.contractNoList[i].contractNo == e) {
-           this.orderList= this.contractNoList[i]
-          }
-        }
-      this.contractNo = e
-      this.getList()
-    },
+			contractchange(e) {
+				for (var i = 0; i < this.contractNoList.length; i++) {
+					if (this.contractNoList[i].contractNo == e) {
+						this.orderList = this.contractNoList[i]
+						if (this.contractNoList[i].depositUrl) {
+							this.addressUrlArray = this.contractNoList[i].depositUrl.split(',')
+						} else {
+							this.addressUrlArray = []
+						}
+					}
+				}
+				this.contractNo = e
+				this.getList()
+			},
 			//选择合同
 			dataFilter(val) {
 				this.contractNo = val
@@ -431,6 +477,35 @@
 						})
 				})
 			},
+			//定金附件
+			fujian() {
+				if (this.orderList.depositUrl === null || this.orderList.depositUrl === '') {
+					EventBus.$emit(
+						'warning',
+						this.$t('system.noticeCircular.NoInformation')
+					)
+				}
+				this.appendixIdss = this.orderList.depositUrl
+				this.accessoryTFs = true
+			},
+			handleClose() {
+				this.accessoryTFs = false
+			},
+			//已收附件
+			fujian1() {
+				if (this.addressUrlArray1.length == 0) {
+					EventBus.$emit(
+						'warning',
+						this.$t('system.noticeCircular.NoInformation')
+					)
+				} else {
+					this.appendixIdss1 = this.collectionScreenshot
+					this.accessoryTFs1 = true
+				}
+			},
+			handleClose1() {
+				this.accessoryTFs1 = false
+			},
 			//收款
 			handlecollect() {
 				this.amountEdReceivable = this.saleList.records[0].amountEdReceivable
@@ -439,7 +514,7 @@
 				this.dialogFormVisible1 = true
 			},
 			collectment() {
-				this.stockSaleReceiptReport.money = this.money			
+				this.stockSaleReceiptReport.money = this.money
 				this.stockSaleReceiptReport.collectionDate = this.collectionDate
 				if (
 					this.money < 0 ||
@@ -523,12 +598,24 @@
 						this.amountReceived = 0
 						this.uncollectedAmount = 0
 						this.outboundVolume = 0
+						let num = []
 						for (var i = 0; i < response.records.length; i++) {
 							response.records[i].identification = 'false'
 							this.amountReceivable += response.records[i].amountIngReceivable
 							this.amountReceived += response.records[i].amountEdReceivable
 							this.uncollectedAmount += response.records[i].amountNotReceivable
 							this.outboundVolume += response.records[i].settlementWeight
+							// this.addressUrlArray1.push(response.records[i].collectionScreenshot.split('$'))
+							num = response.records[i].collectionScreenshot.split('$')
+							for (let j = 0; j < num.length; j++) {
+								if (num[j] != '') {
+									if (this.addressUrlArray1.indexOf(num[j]) == -1) {
+										this.addressUrlArray1.push(num[j])
+									}
+
+								}
+							}
+
 						}
 						this.deptBudgetTotal = response.total
 						this.saleList = response
@@ -854,7 +941,6 @@
 	.el-date-editor.el-input,
 	.el-date-editor.el-input__inner,
 	.el-input-number--small {
-		width: 123% !important;
 	}
 
 	/deep/.el-table td,
@@ -868,16 +954,17 @@
 		height: 220px;
 		line-height: 28px;
 		width: 146%;
-    	margin-left: 15px;
+		margin-left: 15px;
 	}
 
 	.inputs {
 		margin: 0 auto;
 		margin-right: 15%;
 	}
+
 	.inputChenge {
-  		width: 120%;
- 	    display: inline-flex;
-  		margin-left: -69%;
+		width: 120%;
+		display: inline-flex;
+		margin-left: -69%;
 	}
 </style>

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -646,7 +646,9 @@ export default {
             this.dataList = response[0]
             this.dataList1 = response[1]
           } else {
-            if(response[0].taskTypeKey==2){
+            if(response[0].taskTypeKey == 2){
+              this.dataList.taskTypeKey=response[0].taskTypeKey
+              this.dataList.inOutType=response[0].inOutType
               this.dataList1 = response[0]
             }else{
               this.dataList = response[0]

src/views/taskManagement/moveWarehouseTask.vue

@@ -146,14 +146,14 @@
                 </div>
               </div>
             </el-popover>
-            <img
+            <!-- <img
               width="17"
               height="18"
               style="vertical-align: text-top; position: relative; top: -1px"
               src="../../../public/img/edit.png"
               @click="editClick(scope.row)"
               alt=""
-            />
+            /> -->
           </template>
         </el-table-column>
         <el-table-column prop="establishDate" label="发布时间" width="150">

src/views/taskManagement/tranManagementLook.vue

@@ -45,15 +45,17 @@
           <ws-info-table>
             <!-- 始发地 -->
             <ws-form-item label="始发地" span="1" prop="netWeight">
-              {{ deptBudgetList.startPrivate }}/{{ deptBudgetList.startCity
+              {{ deptBudgetList.startPrivate }}{{ deptBudgetList.startCity
               }}{{ deptBudgetList.startArea
               }}{{ deptBudgetList.startDetailedAddress }}
+              （{{deptBudgetList.sendWarehouse}}）
             </ws-form-item>
             <!--终到地-->
             <ws-form-item label="终到地" span="1" prop="netWeight">
-              {{ deptBudgetList.endPrivate }}/{{ deptBudgetList.endCity
+              {{ deptBudgetList.endPrivate }}{{ deptBudgetList.endCity
               }}{{ deptBudgetList.endArea
               }}{{ deptBudgetList.endDetailedAddress }}
+                （{{deptBudgetList.receiveWarehouse}}）
             </ws-form-item>
           </ws-info-table>
         </div>

src/views/taskManagement/tranManagementTransporTationFire.vue

@@ -105,7 +105,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column class="table_td" label="发货">
+        <el-table-column class="table_td" label="发货" width="300">
           <template slot-scope="scope">
             <div
               style="height: 24px"
@@ -115,7 +115,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column class="table_td" label="收货">
+        <el-table-column class="table_td" label="收货" width="300">
           <template slot-scope="scope">
             <div
               style="height: 24px"
@@ -125,7 +125,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column class="table_td" label="运输周期">
+        <el-table-column class="table_td" label="运输周期"  width="160">
           <template slot-scope="scope">
             <div
               style="height: 24px"

src/views/taskManagement/tranManagementTransportEdit.vue

@@ -325,6 +325,7 @@
               placeholder="请输入发货人电话"
               maxlength="20"
               size="small"
+              disabled
             ></el-input>
           </el-form-item>
         </ws-info-table>
@@ -376,6 +377,7 @@
               placeholder="请输入收货人电话"
               maxlength="20"
               size="small"
+              disabled
             ></el-input>
           </el-form-item>
         </ws-info-table>

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -64,7 +64,7 @@
                 v-for="item in warehouseNameList"
                 :key="item.constKey"
                 :label="item.warehouseName"
-                :value="item.warehouseName"
+                :value="item.id"
               />
             </el-select>
           </el-form-item>
@@ -505,7 +505,7 @@
                 v-for="item in warehouseNameList"
                 :key="item.constKey"
                 :label="item.warehouseName"
-                :value="item.warehouseName"
+                :value="item.id"
               />
             </el-select>
           </el-form-item>
@@ -710,14 +710,10 @@ import {
   getwarehousename,
   xialaNo,
   addoreditoutput,
-  outexamine,
   getGoodsName,
 } from '@/model/tasksport/index'
-import { packList } from '@/model/contarct/index'
 import { pullDown, getstaff } from '@/model/warehouse/index'
-import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
-import { mapActions, mapGetters, mapState } from 'vuex'
 import WsUpload from '@/components/WsUpload'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
 import { dayjs, EventBus } from 'base-core-lib'
@@ -855,20 +851,30 @@ export default {
       var year = date.getFullYear() //获取完整的年份(4位)
       var mouth = date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
       var datetime = date.getDate() //获取当前日(1-31)
+      var hour = date.getHours()
+      var minutes = date.getMinutes()
+      var seconds = date .getSeconds()
       if (mouth < 10) {
         mouth = '0' + mouth
       }
       if (datetime < 10) {
         datetime = '0' + datetime
       }
-      return year + mouth + datetime
+      if (hour < 10) {
+        hour = '0' + hour
+      }
+      if (minutes < 10) {
+        minutes = '0' + minutes
+      }
+      if (seconds < 10) {
+        seconds = '0' + seconds
+      }
+      return year +''+ mouth + datetime + hour + minutes + seconds
     },
     // 随机验证码
     verifyinit() {
       var arr = []
-      for (var i = 48; i < 123; i++) {
-        if (i > 57 && i < 65) continue
-        if (i > 90 && i < 97) continue
+      for (var i = 48; i < 57; i++) {
         arr.push(String.fromCharCode(i))
       }
       arr.sort(function () {
@@ -968,7 +974,16 @@ return Num
         }
       }
     },
-    selectwarehouseName() {},
+    selectwarehouseName(e) {
+      //经办人
+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') ,warehouseId:e})
+        .toPromise()
+        .then((response) => {
+          this.options = response
+          this.staffList = response
+          //  this.agent = response
+        })
+    },
     changecontract1(e) {
       if (this.dataList1.taskTypeKey != 3) {
         for (let i = 0; i < this.contractNoList.length; i++) {
@@ -1645,14 +1660,7 @@ return Num
             })
         })
       
-      //经办人
-      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
-        .toPromise()
-        .then((response) => {
-          this.options = response
-          this.staffList = response
-          //  this.agent = response
-        })
+      
     },
     selecttaskType(e) {
       for (var i = 0; i < this.taskTypeList.length; i++) {

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -781,18 +781,14 @@
 import {
   getwarehousename,
   xialaNo,
-  addoreditoutput,
   outexamine,
   getGoodsName,
   warehousetask,
   woekflowhandle,
   gettaskhistories
 } from '@/model/tasksport/index'
-import { packList } from '@/model/contarct/index'
 import { pullDown, getstaff } from '@/model/warehouse/index'
-import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
-import { mapActions, mapGetters, mapState } from 'vuex'
 import WsUpload from '@/components/WsUpload'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
 import { dayjs, EventBus } from 'base-core-lib'

src/views/tranManagement/tranManagementFireReceivingFeedbackLook.vue

@@ -262,9 +262,6 @@
   </div>
 </template>
 <script>
-import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import { seeCat, packList, feedback } from '@/model/transport/index'
-import { getstaff } from '@/model/warehouse/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
 export default {

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -81,9 +81,9 @@
         </el-table-column>
         <el-table-column class="table_td" label="重量（吨）" prop="weight">
         </el-table-column>
-        <el-table-column class="table_td" label="发货" prop="send">
+        <el-table-column class="table_td" label="发货" prop="send" width="300">
         </el-table-column>
-        <el-table-column class="table_td" label="收货" prop="receive">
+        <el-table-column class="table_td" label="收货" prop="receive" width="300">
         </el-table-column>
         <el-table-column
           class="table_td"

src/views/tranManagement/tranManagementReceivingloadingLook.vue

@@ -243,9 +243,8 @@
   </div>
 </template>
 <script>
-import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import { seeCat, packList, feedback } from '@/model/transport/index'
-import { getstaff } from '@/model/warehouse/index'
+import { regionData } from 'element-china-area-data'
+import { seeCat } from '@/model/transport/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
 export default {
@@ -350,7 +349,7 @@ activated(){
           return '司机名称（临）'
         }
        }
-      return "(临)"
+      return '(临)'
 
       // item.temporaryDriverFlag == 0
     },

src/views/tranManagement/tranManagementShipping.vue

@@ -76,11 +76,11 @@
         </el-table-column>
         <el-table-column class="table_td" label="重量（吨）" prop="weight">
         </el-table-column>
-        <el-table-column class="table_td" label="发货" prop="send">
+        <el-table-column class="table_td" label="发货" prop="send" width="300">
         </el-table-column>
-        <el-table-column class="table_td" label="收货" prop="receive">
+        <el-table-column class="table_td" label="收货" prop="receive" width="300">
         </el-table-column>
-        <el-table-column class="table_td" label="运输周期" prop="tranCycle">
+        <el-table-column class="table_td" label="运输周期" prop="tranCycle"  width="160">
           <template scope="scope">
             {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
           </template>

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -84,7 +84,7 @@
             v-for="(item, index) in deptBudgetList.tranCarInfoList"
             :key="index"
           >
-            <div class="zhong">
+            <div class="zhong" v-show="index==0">
               <ws-form-item label="姓名" span="1" prop="driver">
                 <el-select
                   v-if="item.id != null"
@@ -312,6 +312,58 @@
                   class="ys"
                 ></ws-input>
               </ws-form-item>
+            </div>
+              <div class="zhong-other"  v-show="index!=0">
+              <ws-form-item
+                label="仓位号"
+                span="1"
+                prop="binNumber"
+                v-show="item.shipType == '散船'"
+                class="item"
+              >
+                <ws-input
+                  v-if="item.id != null"
+                  :disabled="readonly"
+                  v-model="item.binNumber"
+                  placeholder="请输入仓位号"
+                  maxlength="100"
+                  size="small"
+                  style="width: 110px"
+                ></ws-input>
+                <ws-input
+                  v-else
+                  v-model="item.binNumber"
+                  placeholder="请输入仓位号"
+                  maxlength="100"
+                  size="small"
+                  style="width: 110px"
+                ></ws-input>
+              </ws-form-item>
+              <ws-form-item
+                label="重量(吨)"
+                span="1"
+                prop="positionWeight"
+                v-show="item.shipType == '散船'"
+                class="item"
+              >
+                <ws-input
+                  v-if="item.id != null"
+                  :disabled="readonly"
+                  v-model="item.positionWeight"
+                  placeholder="请输入重量"
+                  maxlength="100"
+                  size="small"
+                  style="width: 110px"
+                ></ws-input>
+                 <ws-input
+                 v-else
+                  v-model="item.positionWeight"
+                  placeholder="请输入重量"
+                  maxlength="100"
+                  size="small"
+                  style="width: 110px"
+                ></ws-input>
+              </ws-form-item>
             </div>
             <span
               v-if="(item.status == '未装车'&& item.shipType == '散船') || item.status == null" 
@@ -351,13 +403,11 @@
   </div>
 </template>
 <script>
-import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
 import { shippingLook, packList, dispatchCat ,delhaulagestage} from '@/model/transport/index'
 import { getstaff } from '@/model/warehouse/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
-import { dayjs, EventBus } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -1350,4 +1400,14 @@ export default {
   height: 10px;
   line-height: 0px;
 }
+.zhong-other{
+  display: flex;
+    margin: 2%;
+    background: #f6f7fc;
+    border-radius: 4px;
+    border: 1px solid #d8dce6;
+    .item{
+      margin: 0;
+    }
+}
 </style>

src/views/tranManagement/tranManagementShippingFeedback.vue

@@ -354,7 +354,7 @@
   </div>
 </template>
 <script>
-import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
+import { regionData} from 'element-china-area-data'
 import { seeCat, packList, feedback, state } from '@/model/transport/index'
 import { getstaff } from '@/model/warehouse/index'
 import WsUpload from '@/components/WsUpload'

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -79,8 +79,8 @@
         <el-table-column prop="tranType" label="运输方式"> </el-table-column>
         <el-table-column prop="goodsName" label="货名"> </el-table-column>
         <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
-        <el-table-column prop="send" label="发货"> </el-table-column>
-        <el-table-column prop="receive" label="收货"> </el-table-column>
+        <el-table-column prop="send" label="发货" width="300"> </el-table-column>
+        <el-table-column prop="receive" label="收货" width="300"> </el-table-column>
         <el-table-column prop="tranCycle" label="运输周期" width="160">
           <template scope="scope">
             {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -78,9 +78,9 @@
         </el-table-column>
         <el-table-column prop="goodsName" label="货名"> </el-table-column>
         <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
-        <el-table-column prop="send" label="发货"> </el-table-column>
-        <el-table-column prop="receive" label="收货"> </el-table-column>
-        <el-table-column prop="tranCycle" label="运输周期">
+        <el-table-column prop="send" label="发货" width="300"> </el-table-column>
+        <el-table-column prop="receive" label="收货" width="300"> </el-table-column>
+        <el-table-column prop="tranCycle" label="运输周期"  width="160">
           <template scope="scope">
             {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
           </template>

src/views/tranManagement/tranManagementTransporTrainDetails.vue

@@ -140,9 +140,8 @@
   </div>
 </template>
 <script>
-import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import { seeCat, dispatchCat, packList } from '@/model/transport/index'
-import { getstaff } from '@/model/warehouse/index'
+import { regionData } from 'element-china-area-data'
+import { seeCat } from '@/model/transport/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
 export default {

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -95,7 +95,7 @@
       >
         <ws-info-table>
           <!--姓名-->
-          <ws-form-item label="姓名" span="1" prop="driver">
+          <ws-form-item label="姓名" span="1" prop="driver" v-show="index==0">
             <el-select
               v-model="item.driver"
               placeholder="请选择姓名"
@@ -112,7 +112,7 @@
             </el-select>
           </ws-form-item>
           <!--电话-->
-          <ws-form-item label="电话" span="1" prop="driverPhone">
+          <ws-form-item label="电话" span="1" prop="driverPhone"  v-show="index==0">
             <ws-input
               v-model="item.driverPhone"
               readonly
@@ -123,7 +123,7 @@
             />
           </ws-form-item>
           <!--发车日期-->
-          <ws-form-item label="发车日期" span="1" prop="sendDateStart">
+          <ws-form-item label="发车日期" span="1" prop="sendDateStart"  v-show="index==0">
             <ws-date-picker
               v-model="item.sendDateStart"
               type="date"
@@ -132,7 +132,7 @@
             />
           </ws-form-item>
           <!--到站日期-->
-          <ws-form-item label="预计到站日期" span="1" prop="receiveDateEnd">
+          <ws-form-item label="预计到站日期" span="1" prop="receiveDateEnd"  v-show="index==0">
             <ws-date-picker
               v-model="item.receiveDateEnd"
               type="date"
@@ -141,7 +141,7 @@
             />
           </ws-form-item>
           <!--车型-->
-          <ws-form-item label="车型" span="1" prop="carModel">
+          <ws-form-item label="车型" span="1" prop="carModel"  v-show="index==0">
             <el-select
               v-model="item.carModel"
               placeholder="请选择车型"
@@ -155,7 +155,7 @@
               />
             </el-select>
           </ws-form-item>
-          <ws-form-item :label="'车厢号'" span="1" prop="boxNo">
+          <ws-form-item :label="'车厢号'" span="1" prop="boxNo"> 
             <ws-input
               v-model="item.boxNo"
               placeholder="请输入车厢号"
@@ -307,7 +307,7 @@ export default {
     // handleClose() {
     //   this.dialogViewSpareMoney = false
     // },
-    add() {
+    add() {debugger
       this.deptBudgetList.tranCarInfoList.push({
         driver: this.deptBudgetList.tranCarInfoList[0].driver,
         driverPhone: this.deptBudgetList.tranCarInfoList[0].driverPhone,

src/views/tranManagement/tranManagementVehicle.vue

@@ -79,9 +79,9 @@
         </el-table-column>
         <el-table-column prop="goodsName" label="货名"> </el-table-column>
         <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
-        <el-table-column prop="send" label="发货"> </el-table-column>
-        <el-table-column prop="receive" label="收货"> </el-table-column>
-        <el-table-column class="table_td" label="运输周期">
+        <el-table-column prop="send" label="发货" width="300"> </el-table-column>
+        <el-table-column prop="receive" label="收货" width="300"> </el-table-column>
+        <el-table-column class="table_td" label="运输周期"  width="160">
           <template slot-scope="scope">
             {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
           </template>

src/views/warehouse/warehouseManagementAdd.vue

@@ -74,16 +74,17 @@
         <!--其他负责人-->
         <ws-form-item label="其他负责人"  span="1" prop="otherPersonCharge">
           <el-select
-            v-model="deptBudgetList.otherPersonCharge"
+            v-model="deptBudgetList.otherPersonPhone"
             placeholder="请选择其他负责人"
             @change="selectstaffOther"
             multiple
+            filterable
           >
             <el-option
               v-for="item in optionsOther"
-              :key="item.value"
+              :key="item.staffMobilePhone"
               :label="item.staffName"
-              :value="item.staffName + ' ' + item.staffMobilePhone "
+              :value="item.staffMobilePhone"
             />
           </el-select>
         </ws-form-item>
@@ -268,6 +269,7 @@ export default {
         addressUrl: '',
       },
       options_: regionData,
+      otherPersonPhone:'',
       heightData: '600px',
       zoom: 7,
       selectedOptions: [],
@@ -360,12 +362,14 @@ export default {
       }
     },
     selectstaffOther(e) {
-      // for (var i = 0; i < this.staffList.length; i++) {
-      //   if (this.staffList[i].staffName == e) {
-      //     this.deptBudgetList.personPhone = this.staffList[i].staffMobilePhone
-      //     this.deptBudgetList.personChargeKey = this.staffList[i].staffId
-      //   }
-      // }
+      this.deptBudgetList.otherPersonCharge = ''
+      for (var i = 0; i < this.optionsOther.length; i++) {
+        for(var j=0;j<e.length;j++){
+          if (this.optionsOther[i].staffMobilePhone == e[j]) {
+            this.deptBudgetList.otherPersonCharge += this.optionsOther[i].staffName + ' '+ this.optionsOther[i].staffMobilePhone + ','
+          }
+        }
+      }
     },
     selectstaff(e) {
       for (var i = 0; i < this.staffList.length; i++) {
@@ -523,7 +527,8 @@ export default {
           .then(() => {
             this.$refs.deptBudgetList.validate((valid) => {
               if (valid) {
-                this.deptBudgetList.otherPersonCharge=this.deptBudgetList.otherPersonCharge.toString()
+                // this.deptBudgetList.otherPersonCharge=this.deptBudgetList.otherPersonCharge.toString()
+                this.deptBudgetList.otherPersonPhone=this.deptBudgetList.otherPersonPhone.toString()
                 this.deptBudgetList.compId =
                   sessionStorage.getItem('ws-pf_compId')
                 this.deptBudgetList.warehousePrivate =

src/views/warehouse/warehouseManagementDelivery.vue

@@ -332,7 +332,7 @@ export default {
       agent: [],
        staffList: [],
       options: [],
-      value:"",
+      value:'',
       rules: {
         netWeight: [
           {
@@ -1170,7 +1170,7 @@ export default {
           this.outContractNo = response
         })
       //经办人
-      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId'),warehouseId:this.deptBudgetList.baseId })
         .toPromise()
         .then((response) => {
           // this.agent = response

src/views/warehouse/warehouseManagementEdit.vue

@@ -80,15 +80,17 @@
           <!--其他负责人-->
         <ws-form-item label="其他负责人"  v-if="warehouseType == 1" span="1" prop="otherPersonCharge">
           <el-select
-            v-model="deptBudgetList.otherPersonCharge"
+            v-model="deptBudgetList.otherPersonPhone"
             placeholder="请选择其他负责人"
+            @change="selectstaffOther"
+            filterable 
             multiple
           >
             <el-option
               v-for="item in optionsOther"
-              :key="item.value"
+              :key="item.staffMobilePhone"
               :label="item.staffName"
-              :value="item.staffName + ' ' + item.staffMobilePhone "
+              :value="item.staffMobilePhone "
             />
           </el-select>
         </ws-form-item>
@@ -319,7 +321,7 @@ export default {
   },
   activated() {
     this.loaddata()
-    getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+    getstaff({ compId: sessionStorage.getItem('ws-pf_compId'),warehouseId:this.baseId })
       .toPromise()
       .then((response) => {
         this.options = response
@@ -346,6 +348,16 @@ export default {
     },
   },
   methods: {
+     selectstaffOther(e) {
+      this.deptBudgetList.otherPersonCharge = ''
+      for (var i = 0; i < this.optionsOther.length; i++) {
+        for(var j=0;j<e.length;j++){
+          if (this.optionsOther[i].staffMobilePhone == e[j]) {
+            this.deptBudgetList.otherPersonCharge += this.optionsOther[i].staffName + ' '+ this.optionsOther[i].staffMobilePhone + ','
+          }
+        }
+      }
+    },
     close(index){
       this.addressUrls.splice(index,1)
     },
@@ -521,7 +533,7 @@ export default {
           //   this.fileList =  this._getFileList(this.deptBudgetList.addressUrl)
           // }
           this.addressUrls = this.deptBudgetList.addressUrl.split(',')
-           this.deptBudgetList.otherPersonCharge=this.deptBudgetList.otherPersonCharge.split(',')
+          this.deptBudgetList.otherPersonPhone=this.deptBudgetList.otherPersonPhone.split(',')
           this.addressUrls.pop()
         })
     },
@@ -654,7 +666,7 @@ export default {
           this.deptBudgetList.baseId = this.baseId
           this.deptBudgetList.compId = this.compId
           this.deptBudgetList.contractType = 1
-           this.deptBudgetList.otherPersonCharge=this.deptBudgetList.otherPersonCharge.toString()
+           this.deptBudgetList.otherPersonPhone=this.deptBudgetList.otherPersonPhone.toString()
           edit(this.deptBudgetList)
             .toPromise()
             .then((response) => {

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -879,7 +879,7 @@ export default {
           this.outContractNo = response
         })
       //经办人
-      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId'),warehouseId:this.dataList.baseId })
         .toPromise()
         .then((response) => {
           this.options = response

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -964,7 +964,7 @@ export default {
           this.outContractNo = response
         })
       //经办人
-      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId'),warehouseId:this.dataList.id })
         .toPromise()
         .then((response) => {
           this.options = response

src/views/warehouse/warehouseManagementPut.vue

@@ -1199,7 +1199,7 @@ export default {
           this.outContractNo = response
         })
       //经办人
-      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') ,warehouseId:this.deptBudgetList.baseId })
         .toPromise()
         .then(response => {
           this.options = response

vue.config.js

@@ -141,7 +141,7 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.120:8090/',
+        target: 'http://192.168.1.122:9100/',
         // target: 'http://192.168.1.112:8090/',
         // target: 'http://192.168.1.121:8090/',
         // target: 'http://192.168.1.119:8090/',