前端

public/static/payprint.html

@@ -194,11 +194,11 @@
             <!-- <div>税务登记编号：91230230MA1BNL7Q93</div> -->
           </div>
           <div class="header-top">
-            <div>单位：公斤、元</div>
+            <div>单位：公斤/元</div>
             <div>No.</div>
           </div>
           <div class="header-top">
-            <div>开票日期：{{printData.currentTime}}</div>
+            <div>开票日期：{{printData.createDate}}</div>
             <!-- <div>开票日期：{{new Date(yyyy,mm,dd)}}</div> -->
             <div class="number">{{dealNo(printData.paymentNo)}}</div>
           </div>

public/static/print.html

@@ -22,6 +22,9 @@
       border-right: 1px solid #EBEEF5; */
       /* padding: 20px; */
       box-sizing: border-box;
+      display: flex;
+      justify-content: center;
+      align-items: center;
     }
 
     .name {
@@ -32,14 +35,14 @@
     }
 
     .price {
-      position: absolute;
+      /* position: absolute;
       right: 10px;
       bottom: 0;
       margin: auto;
       font-size: 14px;
       top: 0;
       display: flex;
-    align-items: center;
+    align-items: center; */
     }
     .tableBox {
       width: 80px;
@@ -66,6 +69,7 @@
     .tableBox .cell {
       text-align: center;
       padding: 0!important;
+      line-height: 22px;
       /* margin:0 2px!important; */
     }
     .table-row{
@@ -96,24 +100,33 @@
     height: 0px;
 }
 .content0{
-  margin-bottom: 30vh;
+  /* margin-bottom: 30vh; */
   /* padding-top: 5vh; */
+  /* background-color: powderblue; */
 }
 .content1{
-  margin-bottom: 30vh;
+  /* margin-bottom: 20vh; */
   /* padding-top: 5vh; */
-
+  margin-top: 15vh;
+/* background: palegreen; */
 }
 .content2{
   /* padding-top: 5vh; */
   /* margin-bottom: 30vh; */
+  margin-top: 15vh;
+  /* background: yellow; */
 }
 .content3{
   /* padding-top: 10px; */
+  margin-top: 15vh;
+  /* background-color: red; */
 }
 .has-gutter th:nth-of-type(1){
   width: 40%;
 }
+.has-gutter th:nth-of-type(2){
+  width: 60%;
+}
 .tableBox7 tr{
 border-right: 1px solid #ccc!important;
 }

src/components/mapdrag/mapdrag.vue

@@ -2,6 +2,17 @@
 .mapContent {
   position: relative;
   margin-top: 80px;
+  .center-add{
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto;
+    z-index: 999;
+    width: 30px;
+    height: 30px;
+  }
 }
 #mapContainer {
   width: 100%;
@@ -49,6 +60,11 @@
 
 <template>
   <div class="mapContent">
+     <img
+        class='center-add'
+        src="../../../public/img/zuobiao.gif"
+        alt=""
+          />
     <div id="mapContainer"></div>
     <div id="tip" v-show="showFlag === false ? false : true">
       <el-select v-model="province" @change="selectP" placeholder="省">
@@ -78,7 +94,7 @@
         >
         </el-option>
       </el-select>
-     
+      <el-button>经纬度：{{center}}</el-button>
       <el-button @click="positions" type="primary" v-if='!isShowaddress'>确定定位</el-button>
       <el-button @click="anewselect" v-if='!isShowaddress'>重新选择</el-button>
       <el-button @click="submit" v-if='isShowaddress'>确定</el-button>
@@ -119,6 +135,7 @@ export default {
       zoomEnable: true,
       dragEnable: true,
       status: true,
+      center:'',
     }
   },
   props: ['flagVisible', 'position','selectedOptions','isShowaddress','type'],
@@ -175,7 +192,7 @@ export default {
       })
       this.marker = new AMap.Marker({
         icon: new AMap.Icon({
-          size: new AMap.Size(36, 44),
+          size: new AMap.Size(0, 0),
           image: image,
         }),
         map: that.map,
@@ -198,6 +215,7 @@ export default {
             that.marker.setPosition(e.poi.location)
             placeSearch.search() // 关键字查询查询
             geocoder.getAddress(e.poi.location, function (status, result) {
+              console.log(e.poi.location,"klokolkjolk")
               if (status === 'complete') {
                 var obj = {}
                 that.province = result.regeocode.addressComponent.province
@@ -219,13 +237,18 @@ export default {
           var geocoder = new AMap.Geocoder({
             radius: 1000,
           })
-          that.map.on('click', function (e) {
-            for (var i = 0, l = that.polygons.length; i < l; i++) {
+          that.map.on('moveend', function(e){
+             that.center = that.map.getCenter(); //获取当前地图中心位置
+             that.center.lat =Number(that.center.lat.toFixed(3))
+             that.center.lng =Number(that.center.lng.toFixed(3))
+              that.center.Q =Number(that.center.Q.toFixed(3))
+             that.center.R =Number(that.center.R.toFixed(3))
+                  for (var i = 0, l = that.polygons.length; i < l; i++) {
               that.polygons[i].setMap(null)
             }
             that.marker.setMap(that.map)
-            that.marker.setPosition(e.lnglat)
-            geocoder.getAddress(e.lnglat, function (status, result) {
+            that.marker.setPosition(that.center)
+            geocoder.getAddress(that.center, function (status, result) {
               if (status === 'complete') {
                 var obj = {}
                 that.province = result.regeocode.addressComponent.province
@@ -234,14 +257,66 @@ export default {
                 obj.formattedAddress = result.regeocode.formattedAddress
                 obj.areacode = result.regeocode.addressComponent.adcode
                 that.address = result.regeocode.formattedAddress
-                obj.lat = e.lnglat.lat
-                obj.lng = e.lnglat.lng
+                obj.lat = that.center.lat
+                obj.lng = that.center.lng
                 that.$emit('pickedAddress', obj)
               } else {
                 that.$emit('pickedAddress', '')
               }
             })
-          })
+          });
+          that.map.on('zoomend', function(){
+            // this.zoom = map.getZoom(); //获取当前地图级别
+            that.center = that.map.getCenter(); //获取当前地图中心位置
+            that.center.lat =Number(that.center.lat.toFixed(3))
+            that.center.lng =Number(that.center.lng.toFixed(3))
+             that.center.Q =Number(that.center.Q.toFixed(3))
+             that.center.R =Number(that.center.R.toFixed(3))
+                       for (var i = 0, l = that.polygons.length; i < l; i++) {
+              that.polygons[i].setMap(null)
+            }
+            that.marker.setMap(that.map)
+            that.marker.setPosition(that.center)
+            geocoder.getAddress(that.center, function (status, result) {
+              if (status === 'complete') {
+                var obj = {}
+                that.province = result.regeocode.addressComponent.province
+                that.city = result.regeocode.addressComponent.city
+                that.district = result.regeocode.addressComponent.district
+                obj.formattedAddress = result.regeocode.formattedAddress
+                obj.areacode = result.regeocode.addressComponent.adcode
+                that.address = result.regeocode.formattedAddress
+                obj.lat = that.center.lat
+                obj.lng = that.center.lng
+                that.$emit('pickedAddress', obj)
+              } else {
+                that.$emit('pickedAddress', '')
+              }
+            })
+          });
+          // that.map.on('click', function (e) {
+          //   for (var i = 0, l = that.polygons.length; i < l; i++) {
+          //     that.polygons[i].setMap(null)
+          //   }
+          //   that.marker.setMap(that.map)
+          //   that.marker.setPosition(e.lnglat)
+          //   geocoder.getAddress(e.lnglat, function (status, result) {
+          //     if (status === 'complete') {
+          //       var obj = {}
+          //       that.province = result.regeocode.addressComponent.province
+          //       that.city = result.regeocode.addressComponent.city
+          //       that.district = result.regeocode.addressComponent.district
+          //       obj.formattedAddress = result.regeocode.formattedAddress
+          //       obj.areacode = result.regeocode.addressComponent.adcode
+          //       that.address = result.regeocode.formattedAddress
+          //       obj.lat = e.lnglat.lat
+          //       obj.lng = e.lnglat.lng
+          //       that.$emit('pickedAddress', obj)
+          //     } else {
+          //       that.$emit('pickedAddress', '')
+          //     }
+          //   })
+          // })
           // 根据坐标点定位,获取地址的详细信息
           if (that.position) {
             that.marker.setMap(that.map)

src/layout/index/top/index.vue

@@ -265,20 +265,20 @@ export default {
       passwordFlag: false,
       passwordMsgRules: {
         originalPassword: [{ required: true, message: ' ', trigger: 'blur' }],
-        newPassword: [
-          {
-            required: true,
-            trigger: 'blur',
-            validator: validPasswordRule.bind(this),
-          },
-        ],
-        password: [
-          {
-            required: true,
-            trigger: 'blur',
-            validator: validPasswordRule2.bind(this),
-          },
-        ],
+        // newPassword: [
+        //   {
+        //     required: true,
+        //     trigger: 'blur',
+        //     validator: validPasswordRule.bind(this),
+        //   },
+        // ],
+        // password: [
+        //   {
+        //     required: true,
+        //     trigger: 'blur',
+        //     validator: validPasswordRule2.bind(this),
+        //   },
+        // ],
       },
       passwordMsg: {
         originalPassword: '', // 原始密码

src/router/index.js

@@ -215,7 +215,12 @@ router.beforeEach(async (to, from, next) => {
       }
     }
     renewalHead(data).toPromise().then(() => {
-      next()
+      console.log(sessionStorage.getItem('paymentManagementReturn'))
+      if(to.name=='settlement'&&sessionStorage.getItem('paymentManagementReturn')=='true'){
+        next(`/houseSelfCollect/paymentManagement`);
+      }else{
+        next()
+      }
     })
     .catch((err) => {
       clearStorage()

src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -1867,7 +1867,7 @@
     left: 0;
     right: 0;
     margin: auto;
-    width: 800px;
+    width: 850px;
     height: 400px;
     background: gainsboro;
     border-radius: 20px;

src/views/contractManagement/futuresPurchaseContractEdit.vue

@@ -1951,7 +1951,7 @@ export default {
   left: 0;
   right: 0;
   margin: auto;
-  width: 800px;
+  width: 850px;
   height: 400px;
   background: gainsboro;
   border-radius: 20px;

src/views/contractManagement/futuresSalesContractAdd.vue

@@ -1823,7 +1823,7 @@
     left: 0;
     right: 0;
     margin: auto;
-    width: 800px;
+    width: 850px;
     height: 400px;
     background: gainsboro;
     border-radius: 20px;

src/views/contractManagement/futuresSalesContractEdit.vue

@@ -1714,4 +1714,28 @@
     line-height: inherit;
     display: none;
   }
+   .map {
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto;
+    width: 850px;
+    height: 400px;
+    background: gainsboro;
+    border-radius: 20px;
+    padding: 10px;
+    box-sizing: border-box;
+    z-index: 99;
+  }
+
+  .amap-container {
+    width: 100% !important;
+  }
+
+  .address-btn {
+    width: 100%;
+    text-align: left;
+  }
 </style>

src/views/contractManagement/purchaseContractAdd.vue

@@ -1794,7 +1794,7 @@
     left: 0;
     right: 0;
     margin: auto;
-    width: 800px;
+    width: 850px;
     height: 400px;
     background: gainsboro;
     border-radius: 20px;

src/views/contractManagement/purchaseContractEdit.vue

@@ -1692,7 +1692,7 @@ export default {
   left: 0;
   right: 0;
   margin: auto;
-  width: 800px;
+  width: 850px;
   height: 400px;
   background: gainsboro;
   border-radius: 20px;

src/views/contractManagement/salesContractAdd.vue

@@ -1817,7 +1817,7 @@
     left: 0;
     right: 0;
     margin: auto;
-    width: 800px;
+    width: 850px;
     height: 400px;
     background: gainsboro;
     border-radius: 20px;

src/views/contractManagement/salesContractEdit.vue

@@ -1617,7 +1617,7 @@
     left: 0;
     right: 0;
     margin: auto;
-    width: 800px;
+    width: 850px;
     height: 400px;
     background: gainsboro;
     border-radius: 20px;

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -26,7 +26,8 @@
               <el-input type="number" @mousewheel.native.prevent v-model="baseInfoForm.waterBase" @input="changeBaseWater" :disabled="!isEdit"></el-input>
             </el-form-item>
           </div>
-          <div v-if="baseInfoForm.paramType != '1'" class="grid-content">
+          <!-- <div v-if="baseInfoForm.paramType != '1'" class="grid-content"> -->
+          <div class="grid-content">
             <el-form-item label="扣重比">
               <el-input type="number" @mousewheel.native.prevent v-model="baseInfoForm.deductWeight" :disabled="!isEdit"></el-input>
             </el-form-item>

src/views/houseSelfCollect/paymentManagement.vue

@@ -32,15 +32,16 @@
         <ws-button
           :type="searchType == 0 ? 'primary' : ''"
           @click="screen(1)"
-          v-if="isShowAdopt"
+          v-if="isShowAdopt == 'true'"
         >待审核</ws-button>
         <ws-button
           :type="searchType == 0 ? 'primary' : ''"
           @click="screen(7)"
           v-hasPermission="`acquisitionManagement.acquisitionPay.pay`"
         >待付款</ws-button>
-        <ws-button :type="searchType == 2 ? 'primary' : ''" @click="screen(2)">待结算</ws-button>
+        <ws-button :type="searchType == 2 ? 'primary' : ''" @click="screen(2)" v-hasPermission="`acquisitionManagement.acquisitionPay.add`">待结算</ws-button>
         <ws-button :type="searchType == -1 ? 'primary' : ''" @click="screen(-1)">全部</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="invoicingClick" v-if="isShowAdopt" v-hasPermission="`acquisitionManagement.acquisitionPay.finace`">开票</ws-button>
@@ -134,6 +135,10 @@
                     scope.row.status == '待结算'
                   "
               @click="settlement(1, scope.row)"
+            >结算</el-button>
+                      <el-button
+            
+              @click="settlement(1, scope.row)"
             >结算</el-button>
           </span>
 
@@ -399,16 +404,16 @@ export default {
         })
     },
     handleRowClick(row) {
-      if (row.approveStatus == null) {
-        this.$refs.paymentList.toggleRowSelection(row)
-        return true
-      } else if (row.approveStatus != null) {
-        if (row.taskId == null) {
+     if (row.status != '已驳回') {
+        if (row.taskId == null && row.status != '已通过'&& row.status != '部分付款') {
           return false
         } else {
           this.$refs.paymentList.toggleRowSelection(row)
           return true
         }
+      }else{
+        this.$refs.paymentList.toggleRowSelection(row)
+         return true
       }
     },
     handlepass() {
@@ -506,7 +511,6 @@ export default {
           this.paymentList = response
           this.deptBudgetTotal = response.total
         })
-
       getJurisdiction({
         managementType: 1,
         warehouseName: this.warehouseName,
@@ -572,11 +576,15 @@ export default {
       this.getList()
     },
     settlement(index, row) {
-      if (row.goodsName)
+      if (row.goodsName){
+      sessionStorage.setItem('paymentManagementReturn', false)
         this.$router.push({
-          path: 'settlement',
-          query: { type: index, id: row.id }
-        })
+                path: 'settlement',
+                query: { type: index, id: row.id }
+              })
+      }
+      
+     
     },
     payment() {
       this.imageUrl = ''
@@ -601,7 +609,7 @@ export default {
         })
         return
       }
-      if (this.payments.money > this.payments.amountNotPayable) {
+      if (Number(this.payments.money) > Number(this.payments.amountNotPayable)) {
         this.$message({
           message: '付款金额不能超过未付金额',
           type: 'warning'
@@ -730,7 +738,7 @@ export default {
           })
       }
     },
-    print(row) {debugger
+    print(row) {
       console.log('打印数据', row)
       if (sessionStorage.getItem('ws-pf_roleName') == '财务') {
         this.isShowPrintType = true

src/views/houseSelfCollect/settlement.vue

@@ -765,15 +765,16 @@ export default {
             type: 'warning',
           })
       }
-      
     },
     cancel() {
       this.isShowPrint = false
       this.paymentList = [] 
+      sessionStorage.setItem('paymentManagementReturn', true)
       this.$router.push({ path: 'paymentManagement' })
     },
     closePrint(){
         this.isShowPrint = false
+         sessionStorage.setItem('paymentManagementReturn', true)
         this.$router.push({path:'paymentManagement'})
       },
   },

src/views/houseSelfCollect/weighingManagement.vue

@@ -33,7 +33,7 @@
 			<el-table-column prop="type" label="类型"></el-table-column>
 			<el-table-column prop="grossWeight" label="毛重（公斤）"></el-table-column>
 			<el-table-column prop="tare" label="皮重（公斤）"></el-table-column>
-			<el-table-column prop="buckleMiscellaneous" label="扣杂（公斤）"></el-table-column>
+			<el-table-column prop="buckleMiscellaneous" label="扣杂"></el-table-column>
 			<el-table-column prop="netWeight" label="净重（公斤）"></el-table-column>
 			<el-table-column prop="binNumber" label="仓位号"></el-table-column>
 			<el-table-column prop="storageNumber" label="囤位号"></el-table-column>

src/views/houseSelfCollect/weightCheck.vue

@@ -21,26 +21,22 @@
         <h2 class="bg-left titleup">实时监控</h2>
         <div class="bottom">
           <div v-if="!monitorUrl1" class="video1">
-            <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" >
-            <div >监控视频未连接</div>
-              
+            <img src="../../../public/img/quesheng@2x.png" alt="" class="img1">
+            <div>监控视频未连接</div>
+
           </div>
           <div v-else class="video1">
-           <iframe :src="monitorUrl1" width="440" height="360" allowfullscreen ="true"
-           webkitallowfullscreen="true"
-           mozallowfullscreen="true"
-           allow="autoplay; fullscreen; microphone;"></iframe>
+            <iframe :src="monitorUrl1" width="440" height="360" allowfullscreen="true" webkitallowfullscreen="true"
+              mozallowfullscreen="true" allow="autoplay; fullscreen; microphone;"></iframe>
           </div>
           <div v-if="!monitorUrl2" class="video1">
-            <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" >
-            <div >监控视频未连接</div>
-              
+            <img src="../../../public/img/quesheng@2x.png" alt="" class="img1">
+            <div>监控视频未连接</div>
+
           </div>
           <div v-else class="video2">
-           <iframe :src="monitorUrl2" width="440" height="360" allowfullscreen="true"
-           webkitallowfullscreen="true"
-           mozallowfullscreen="true"
-            allow="autoplay; fullscreen; microphone;"></iframe>
+            <iframe :src="monitorUrl2" width="440" height="360" allowfullscreen="true" webkitallowfullscreen="true"
+              mozallowfullscreen="true" allow="autoplay; fullscreen; microphone;"></iframe>
           </div>
         </div>
       </div>
@@ -74,26 +70,28 @@
                 <ws-input v-model="weighingList.goodsName" placeholder="请输入货名" maxlength="100" size="small" disabled />
               </ws-form-item>
               <ws-form-item label="毛重（公斤）" span="1" prop="grossWeight">
-                <ws-input type="number" @mousewheel.native.prevent v-if="this.index == 0" v-model="weighingList.grossWeight" @input="calculation"
-                  placeholder="未获取到毛重" maxlength="100" size="small" :disabled="disabled" />
-                <ws-input type="number" @mousewheel.native.prevent v-else v-model="weighingList.grossWeight" @input="calculation" placeholder="未获取到毛重"
-                  maxlength="100" size="small" disabled />
+                <ws-input type="number" @mousewheel.native.prevent v-if="this.index == 0"
+                  v-model="weighingList.grossWeight" @input="calculation" placeholder="未获取到毛重" maxlength="100"
+                  size="small" :disabled="disabled" />
+                <ws-input type="number" @mousewheel.native.prevent v-else v-model="weighingList.grossWeight"
+                  @input="calculation" placeholder="未获取到毛重" maxlength="100" size="small" disabled />
               </ws-form-item>
               <el-button type="primary" :class="index ==0 ? '' : 'butCss'" @click="openPort">重新获取</el-button>
               <ws-form-item label="皮重（公斤）" span="1" prop="tare" v-if="information == '皮重'">
-                <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.tare" @input="calculation" placeholder="未获取到皮重" maxlength="100"
-                  size="small" :disabled="disabled" />
+                <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.tare" @input="calculation"
+                  placeholder="未获取到皮重" maxlength="100" size="small" :disabled="disabled" />
               </ws-form-item>
               <el-button type="primary" v-if="index != 0" @click="openPort">重新获取</el-button>
               <div class="formItem">
-                <ws-form-item label="扣重（公斤）" span="1" prop="buckleWeightRatio" v-if="information == '皮重' && paramType == '2'">
-                  <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.buckleMiscellaneous" @input="calculation" placeholder="请输入扣重"
-                    maxlength="100" size="small" />
+                <ws-form-item label="扣重（公斤）" span="1" prop="buckleWeightRatio"
+                  v-if="information == '皮重' && paramType == '2'">
+                  <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.buckleMiscellaneous"
+                    @input="calculation" placeholder="请输入扣重" maxlength="100" size="small" />
                 </ws-form-item>
 
                 <ws-form-item label="净重（公斤）" span="1" prop="netWeight" v-if="information == '皮重'">
-                  <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.netWeight" placeholder="请输入净重" maxlength="100" size="small"
-                    disabled />
+                  <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.netWeight"
+                    placeholder="请输入净重" maxlength="100" size="small" disabled />
                 </ws-form-item>
               </div>
             </ws-info-table>
@@ -142,7 +140,8 @@
       </div>
 
     </div>
-    <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食检斤单" @close="closeDialog" :close-on-click-modal="false">
+    <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食检斤单" @close="closeDialog"
+      :close-on-click-modal="false">
       <weightCheckPrint :tableData="inspect" ref="saveImg"></weightCheckPrint>
       <div style="text-align:center">
         <el-button type="primary" @click="closePrint">关闭</el-button>
@@ -168,15 +167,15 @@
     components: {
       weightCheckPrint,
     },
-    watch:{
-      weighingList:{//深度监听，可监听到对象、数组的变化
-         handler(val, oldVal){
-           if(val.tare){
-             this.weighingList.netWeight = this.weighingList.grossWeight - val.tare
-           }
-         },
-         deep:true //true 深度监听
-     }
+    watch: {
+      weighingList: { //深度监听，可监听到对象、数组的变化
+        handler(val, oldVal) {
+          if (val.tare) {
+            this.weighingList.netWeight = this.weighingList.grossWeight - val.tare
+          }
+        },
+        deep: true //true 深度监听
+      }
     },
     data() {
       return {
@@ -215,9 +214,9 @@
         param: 9600,
         monitorUrl1: '',
         monitorUrl2: '',
-        cangid:'',
-        paramType:'1',
-        warehouseName:''
+        cangid: '',
+        paramType: '1',
+        warehouseName: ''
       }
     },
     activated() {
@@ -240,8 +239,7 @@
       this.warehouseId = this.$route.query.warehouseId
       if (!this.$route.query.grossWeight) {
         this.$route.query.grossWeight = 0
-      }
-      else{
+      } else {
         this.weighingList.grossWeight = this.$route.query.grossWeight
       }
       // this.purchasePriceList = this.$route.query.purchasePriceList
@@ -291,7 +289,8 @@
           .then((response) => {
             for (let i = 0; i < response.records.length; i++) {
               if (response.records[i].paymentManagement) {
-                if (response.records[i].paymentManagement.status == '待结算' && !response.records[i].paymentManagement.approveStatus) {
+                if (response.records[i].paymentManagement.status == '待结算' && !response.records[i].paymentManagement
+                  .approveStatus) {
                   response.records[i].allow = 1
                 } else {
                   response.records[i].allow = 2
@@ -315,13 +314,13 @@
         console.log(this.common.commonWeighingList, 'commonWeighingList')
         let _list = this.common.commonWeighingList
         for (let i = 0; i < _list.length; i++) {
-          if(_list[i].allow == 2){
+          if (_list[i].allow == 2) {
             continue
           }
           if (_list[i].status == '已质检' || _list[i].status == '已称毛重') {
             this.mList.push(_list[i])
           }
-          
+
           if ((_list[i].status == '已称皮重' || _list[i].status == '已称毛重')) {
             this.pList.push(_list[i])
           }
@@ -330,42 +329,66 @@
           this.index = 0
           this.carList = this.mList
           if (this.mList.length != 0) {
-      let _item = this.mList.filter(function(val){
-        console.log(that.$route.query.id)
-                if(val.id==that.$route.query.id){
-                  return val
-                }
+            let _item = this.mList.filter(function(val) {
+              console.log(that.$route.query.id)
+              if (val.id == that.$route.query.id) {
+                return val
+              }
             })
+            if (_item.length != 0) {
+              this.setCurrent(_item[0])
+
+              this.weighingList = _item[0]
+              this.carWeightInfo = {
+                carNumber: _item[0].carNumber,
+                type: this.information,
+                weight: this.weighingList.grossWeight
+              }
 
-            this.setCurrent(_item[0])
+              this.weighingList = _item[0]
+            } else {
+              this.setCurrent(this.mList[0])
 
-            this.carWeightInfo = {
-              carNumber: _item[0].carNumber,
-              type: this.information,
-              weight: this.weighingList.grossWeight
+              this.weighingList = this.mList[0]
+              this.carWeightInfo = {
+                carNumber: this.mList[0].carNumber,
+                type: this.information,
+                weight: this.weighingList.grossWeight
+              }
             }
-            this.deptBudgetTotal =  this.mList.length
+            this.deptBudgetTotal = this.mList.length
           }
-          this.weighingList = _item[0]
+
         } else {
           this.index = 1
           this.carList = this.pList
           if (this.pList.length != 0) {
-            let _item = this.pList.filter(function(val1){
-                if(val1.id==that.$route.query.id){
-                  return val1
-                }
+            let _item = this.pList.filter(function(val1) {
+              if (val1.id == that.$route.query.id) {
+                return val1
+              }
             })
-            this.setCurrent(_item[0])
-
-            this.carWeightInfo = {
-              carNumber: _item[0].carNumber,
-              type: this.information,
-              weight: this.weighingList.tare
+            if (_item.length != 0) {
+              this.setCurrent(_item[0])
+              this.weighingList = _item[0]
+              this.carWeightInfo = {
+                carNumber: _item[0].carNumber,
+                type: this.information,
+                weight: this.weighingList.tare
+              }
+            } else {
+              this.setCurrent(this.pList[0])
+
+              this.weighingList = this.pList[0]
+              this.carWeightInfo = {
+                carNumber: this.pList[0].carNumber,
+                type: this.information,
+                weight: this.weighingList.tare
+              }
             }
-             this.deptBudgetTotal =  this.pList.length
+
+            this.deptBudgetTotal = this.pList.length
           }
-          this.weighingList = _item[0]
         }
       },
       tabClick(val) {
@@ -409,7 +432,7 @@
             baudRate: this.param
           }); // set baud rate
           this.reader = port.readable.getReader();
-          
+
           // 监听来自串行设备的数据
           while (true) {
             const {
@@ -427,7 +450,7 @@
             // var receData = HexConvert.ByteToString(value);
             // console.log("receData",receData);
             var flag = false;
-            if(this.warehouseName&&this.warehouseName == '山东诸城迈饶库'){
+            if (this.warehouseName && this.warehouseName == '山东诸城迈饶库') {
               for (var i = 0; i < value.length; i++) {
                 var tmp = String.fromCharCode(value[i])
                 if (tmp == '+') {
@@ -438,22 +461,21 @@
                 }
               }
               if (this.tpyeNo != 2) {
-                if(parseInt(result)|| parseInt(result) == 0){
+                if (parseInt(result) || parseInt(result) == 0) {
                   this.weighingList.grossWeight = parseInt(result)
                 }
               } else {
-                if(parseInt(result)|| parseInt(result) == 0){
+                if (parseInt(result) || parseInt(result) == 0) {
                   this.weighingList.tare = parseInt(result)
                 }
               }
-            }
-            else{
-              for(var i=0;i<value.length;i++){
+            } else {
+              for (var i = 0; i < value.length; i++) {
                 var tmp = String.fromCharCode(value[i])
-                if(value[0] != 49 && value[0] != 2){
+                if (value[0] != 49 && value[0] != 2) {
                   break
                 }
-                if (tmp == String.fromCharCode(32) ) {
+                if (tmp == String.fromCharCode(32)) {
                   flag = true
                 }
                 if (flag && result.length < 7 && tmp != String.fromCharCode(32)) {
@@ -467,16 +489,16 @@
                 }
               }
               if (this.tpyeNo != 2) {
-                if(parseInt(result)|| parseInt(result) == 0){
-                  this.weighingList.grossWeight = parseInt(result)*100
+                if (parseInt(result) || parseInt(result) == 0) {
+                  this.weighingList.grossWeight = parseInt(result) * 100
                 }
               } else {
-                if(parseInt(result)|| parseInt(result) == 0){
-                  this.weighingList.tare = parseInt(result)*100
+                if (parseInt(result) || parseInt(result) == 0) {
+                  this.weighingList.tare = parseInt(result) * 100
                 }
               }
             }
-            
+
             setTimeout(1000)
             // value 是一个 Uint8Array
           }
@@ -639,7 +661,7 @@
                       //累计售粮超上限不能完成毛检保存
                       let count = (this.purchasePriceList[i].saleLimit - response / 1000).toFixed(2)
                       // console.log(this.weighingList.grossWeight / 1000, '毛重转吨')
-                      this.weighingList.grossWeight/=1000
+                      // this.weighingList.grossWeight/=1000
                       if (count - this.weighingList.grossWeight / 1000 < 0) {
                         this.$alert(
                           '该客户累计销售' +
@@ -662,7 +684,7 @@
                         //累计售粮没有超上限完成毛检保存
                         this.weighingList.relationId = this.relationId;
                         this.weighingList.secretaryWeigher = sessionStorage.getItem('ws-pf_staffName'),
-                        grossWeight(this.weighingList)
+                          grossWeight(this.weighingList)
                           .toPromise()
                           .then((response) => {
                             this.$notify.success({
@@ -679,12 +701,12 @@
                   }
                 })
             } else if (this.tpyeNo == 2) {
-              this.weighingList.grossWeight/=1000
-              this.weighingList.tare/=1000
-              if(this.weighingList.buckleMiscellaneous){
-                this.weighingList.buckleMiscellaneous/=1000
-              }
-              this.weighingList.netWeight/=1000
+              // this.weighingList.grossWeight/=1000
+              // this.weighingList.tare/=1000
+              // if(this.weighingList.buckleMiscellaneous){
+              //   this.weighingList.buckleMiscellaneous/=1000
+              // }
+              // this.weighingList.netWeight/=1000
               this.weighingList.warehouseId = this.warehouseId;
               (this.weighingList.skinInspector =
                 sessionStorage.getItem('ws-pf_staffName')),
@@ -800,10 +822,12 @@
         padding: 20px;
         border-radius: 10px;
         margin: 0 20px 20px 20px;
-        .car-type{
+
+        .car-type {
           text-align: left;
         }
-        .kg-style{
+
+        .kg-style {
           font-size: 30px;
         }
       }
@@ -929,7 +953,8 @@
     padding: 10px 0 !important;
     height: auto !important;
   }
-  .weight{
+
+  .weight {
     font-size: 68px;
   }
 </style>

src/views/statisticalReport/autoSettlementList.vue

@@ -88,7 +88,6 @@
           </el-select>
         </el-col>
       </el-row>
-
       <el-table
         class="wenzi"
         :data="warehouseList.records"
@@ -96,7 +95,6 @@
         ref="warehouseList"
         border
         :summary-method="getSummaries"
-        show-summary
         @row-click="handleRowClick"
         @selection-change="handleSelectionChange"
       >

src/views/statisticalReport/huoyunList.vue

@@ -108,7 +108,8 @@
           </el-select>
         </el-col>
       </el-row>
-      <div class="freightSet" v-if="actualFreight && tranPriceIng">
+      <!-- v-if="actualFreight && tranPriceIng" -->
+      <div class="freightSet" >
         <div style="display: flex;width:200px;line-height: 30px;"> 预计运费（元）：{{tranPriceIng}}元</div>
         <span style="display: flex;line-height: 30px;">实际运费（元）：<el-input type="text" maxlength="70" size="small"  v-model="actualFreight" v-show="textShow"/><span v-show="!textShow">{{actualFreight}}</span>元</span>
         <i @click="actualFreightchange" class="iconfont icon-dui" v-show="textShow" style="margin-top:10px"></i>

src/views/statisticalReport/shippingList.vue

@@ -109,7 +109,8 @@
           </el-select>
         </el-col>
       </el-row>
-       <div class="freightSet" v-if="actualFreight && tranPriceIng">
+      <!-- v-if="actualFreight && tranPriceIng" -->
+       <div class="freightSet">
         <div style="display: flex;width:200px;line-height: 30px;"> 预计运费（元）：{{tranPriceIng}}元</div>
         <span style="display: flex;line-height: 30px;">实际运费（元）：<el-input type="text" maxlength="70" size="small"  v-model="actualFreight" v-show="textShow"/><span v-show="!textShow">{{actualFreight}}</span>元</span>
         <i @click="actualFreightchange" class="iconfont icon-dui" v-show="textShow" style="margin-top:10px"></i>

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -122,8 +122,12 @@
           <el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
             {{dataList.predictDate}}
           </el-form-item>
-          <!--经办人-->
-          <el-form-item label="出库经办人">
+          	<!--预估运费（元/吨）-->
+					<el-form-item label="预估运费（元/吨）" span="1">
+              {{dataList.estimatedFreight}}
+					</el-form-item>
+          <!--发货人-->
+          <el-form-item label="发货人">
             {{dataList.agent}}
             <el-option
               v-for="item in options"
@@ -226,8 +230,12 @@
           <el-form-item label="预计入库日期" span="1" prop="predictDate" class="deliverydate">
             {{dataList1.predictDate}}
           </el-form-item>
-          <!--经办人-->
-          <el-form-item label="入库经办人">
+          		<!--预估运费（元/吨）-->
+					<el-form-item label="预估运费（元/吨）" span="1" >
+              {{dataList1.estimatedFreight}}
+          </el-form-item>
+          <!--收货人-->
+          <el-form-item label="收货人">
             <el-option
               v-for="item in options"
               :key="item.value"
@@ -336,8 +344,12 @@
           <el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
             {{dataList.predictDate}}
           </el-form-item>
-          <!--经办人-->
-          <el-form-item label="出库经办人">
+          		<!--预估运费（元/吨）-->
+					<el-form-item label="预估运费（元/吨）" span="1" >
+          {{dataList.estimatedFreight}}
+					</el-form-item>
+          <!--发货人-->
+          <el-form-item label="发货人">
             {{dataList.agent}}
             <el-option
               v-for="item in options"

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -76,7 +76,7 @@
 						</el-select>
 					</el-form-item>
 					<!--重量（吨）-->
-					<el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
+					<el-form-item label="重量（吨）">
 						<el-input @input="weightchange1" v-model="dataList.weight" placeholder="请输入重量（吨）"
 							maxlength="120" size="small" class="huom" />
 					</el-form-item>
@@ -94,12 +94,12 @@
 							maxlength="120" size="small" class="huom" />
 					</el-form-item>
 					<!--水分（%）<=-->
-					<el-form-item label="水分（%）<=" span="1" style="margin-left: 250px; margin-top: -40px">
+					<el-form-item label="水分（%）<=">
 						<el-input disabled @input="waterContentchange" v-model="dataList.waterContent"
 							placeholder="请输入水分占比" maxlength="120" size="small" class="huom" />
 					</el-form-item>
 					<!--单价(元/吨)-->
-					<el-form-item label="单价(元/吨)" span="1" style="margin-left: 500px; margin-top: -40px">
+					<el-form-item label="单价(元/吨)">
 						<el-input disabled @input="unitPricechange" v-model="dataList.unitPrice" placeholder="请输入单价"
 							maxlength="120" size="small" class="huom" />
 					</el-form-item>
@@ -107,6 +107,11 @@
 					<el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
 						<el-date-picker v-model="dataList.predictDate" type="date" placeholder="请选择预计出库日期"
 							value-format="yyyy-MM-dd" />
+					</el-form-item>
+						<!--预估运费（元/吨）-->
+					<el-form-item label="预估运费（元/吨）" span="1">
+						<el-input v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
+							maxlength="20" size="small" />
 					</el-form-item>
 					<!--经办人-->
 					<el-form-item label="发货人">
@@ -174,7 +179,7 @@
 						</el-select>
 					</el-form-item>
 					<!--重量（吨）-->
-					<el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
+					<el-form-item label="重量（吨）">
 						<el-input @input="weightchange" v-model="dataList1.weight" placeholder="请输入重量（吨）"
 							maxlength="120" size="small" class="huom" />
 					</el-form-item>
@@ -193,13 +198,13 @@
 							class="huom" />
 					</el-form-item>
 					<!--水分（%）<=-->
-					<el-form-item label="水分（%）<=" span="1" style="margin-left: 350px; margin-top: -40px">
+					<el-form-item label="水分（%）<=">
 						<el-input @input="waterContentchange" :disabled="dataList.taskTypeKey == 3"
 							v-model="dataList1.waterContent" placeholder="请输入水分占比" maxlength="120" size="small"
 							class="huom" />
 					</el-form-item>
 					<!--单价(元/吨)-->
-					<el-form-item label="单价(元/吨)" span="1" style="margin-left: 650px; margin-top: -40px">
+					<el-form-item label="单价(元/吨)">
 						<el-input @input="unitPricechange" :disabled="dataList.taskTypeKey == 3"
 							v-model="dataList1.unitPrice" placeholder="请输入单价" maxlength="120" size="small"
 							class="huom" />
@@ -208,6 +213,11 @@
 					<el-form-item label="预计入库日期" span="1" prop="predictDate" class="deliverydate">
 						<el-date-picker v-model="dataList1.predictDate" type="date" placeholder="请选择预计入库日期"
 							value-format="yyyy-MM-dd" />
+					</el-form-item>
+							<!--预估运费（元/吨）-->
+					<el-form-item label="预估运费（元/吨）" span="1" >
+						<el-input v-model="dataList1.estimatedFreight" placeholder="请输入预估运费"
+							maxlength="20" size="small"  />
 					</el-form-item>
 					<!-- 经办人-->
 					<el-form-item label="收货人">
@@ -277,7 +287,7 @@
 						</el-select>
 					</el-form-item>
 					<!--重量（吨）-->
-					<el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
+					<el-form-item label="重量（吨）">
 						<el-input :disabled="dataList.taskTypeKey == 4" v-model="dataList.weight" placeholder="请输入重量（吨）"
 							maxlength="120" size="small" class="huom" />
 					</el-form-item>
@@ -296,13 +306,13 @@
 							class="huom" />
 					</el-form-item>
 					<!--水分（%）<=-->
-					<el-form-item label="水分（%）<=" span="1" style="margin-left: 350px; margin-top: -40px">
+					<el-form-item label="水分（%）<=">
 						<el-input :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
 							v-model="dataList.waterContent" placeholder="请输入水分占比" maxlength="120" size="small"
 							class="huom" />
 					</el-form-item>
 					<!--单价(元/吨)-->
-					<el-form-item label="单价(元/吨)" span="1" style="margin-left: 650px; margin-top: -40px">
+					<el-form-item label="单价(元/吨)">
 						<el-input :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
 							v-model="dataList.unitPrice" placeholder="请输入单价" maxlength="120" size="small"
 							class="huom" />
@@ -311,6 +321,11 @@
 					<el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
 						<el-date-picker v-model="dataList.predictDate" type="date" placeholder="请选择预计出库日期"
 							value-format="yyyy-MM-dd" />
+					</el-form-item>
+							<!--预估运费（元/吨）-->
+					<el-form-item label="预估运费（元/吨）" span="1" >
+						<el-input v-model="dataList1.estimatedFreight" placeholder="请输入预估运费"
+							maxlength="20" size="small"  />
 					</el-form-item>
 					<!--发货人-->
 					<el-form-item label="发货人">
@@ -1583,6 +1598,7 @@
 				//     this.deliveryType = response
 				//   })
 				//仓库名
+				debugger
 				getwarehousename({
 						compId: this.compId,
 						warehouseType: 1
@@ -1596,6 +1612,7 @@
 							})
 							.toPromise()
 							.then(response => {
+								console.log("查仓库sss",response)
 								for (var i = 0; i < response.length; i++) {
 									this.warehouseNameList.push(response[i])
 								}
@@ -1817,7 +1834,7 @@
 	}
 
 	.huom {
-		width: 100px;
+		width: 100%;
 	}
 
 	.el-form {

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -6,7 +6,12 @@
         <h2 class="bg-left title">审核出入库任务</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
-        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="returnsales()"
+        >
           <img
             width="6"
             height="10"
@@ -19,27 +24,52 @@
     </el-row>
     <div class="basicInformation">
       <div class="annu">
-        <el-radio-group @change="tasktypechange" v-model="dataList.taskTypeKey"></el-radio-group>
+        <el-radio-group
+          @change="tasktypechange"
+          v-model="dataList.taskTypeKey"
+        ></el-radio-group>
         <div class="nav">
           <span class="ziti">
             任务类型：
             <h1
               class="ziti1"
-              v-show="dataList.inOutType == '移库入库'||dataList.inOutType == '移库出库'"
-            >移库任务</h1>
+              v-show="
+                dataList.inOutType == '移库入库' ||
+                dataList.inOutType == '移库出库'
+              "
+            >
+              移库任务
+            </h1>
             <h1
               class="ziti1"
-              v-show="dataList.inOutType == '销售出库'||dataList.inOutType == '暂存出库'||dataList.inOutType == '贸易服务出库'||dataList.inOutType == '采购出库'"
-            >出库任务</h1>
+              v-show="
+                dataList.inOutType == '销售出库' ||
+                dataList.inOutType == '暂存出库' ||
+                dataList.inOutType == '贸易服务出库' ||
+                dataList.inOutType == '采购出库'
+              "
+            >
+              出库任务
+            </h1>
             <h1
               class="ziti1"
-              v-show="dataList.inOutType == '采购入库'||dataList.inOutType == '暂存入库'||dataList.inOutType == '贸易服务入库'||dataList.inOutType == '退库'"
-            >入库任务</h1>
+              v-show="
+                dataList.inOutType == '采购入库' ||
+                dataList.inOutType == '暂存入库' ||
+                dataList.inOutType == '贸易服务入库' ||
+                dataList.inOutType == '退库'
+              "
+            >
+              入库任务
+            </h1>
           </span>
         </div>
       </div>
       <div class="ding"></div>
-      <div v-if="dataList.taskTypeKey != 2 && dataList.taskTypeKey != 4" class="center1">
+      <div
+        v-if="dataList.taskTypeKey != 2 && dataList.taskTypeKey != 4"
+        class="center1"
+      >
         <img
           style="position: relative; top: 40px; left: 300px"
           width="19"
@@ -144,7 +174,7 @@
             </el-select>
           </el-form-item>
           <!--重量（吨）-->
-          <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
+          <el-form-item label="重量（吨）">
             <el-input
               disabled
               v-model="dataList.weight"
@@ -182,7 +212,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=" span="1" style="margin-left: 350px; margin-top: -40px">
+          <el-form-item label="水分（%）<=">
             <el-input
               @input="waterContentchange"
               v-model="dataList.waterContent"
@@ -193,7 +223,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)" span="1" style="margin-left: 650px; margin-top: -40px">
+          <el-form-item label="单价(元/吨)">
             <el-input
               @input="unitPricechange"
               v-model="dataList.unitPrice"
@@ -204,7 +234,12 @@
             />
           </el-form-item>
           <!--预计出库日期-->
-          <el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
+          <el-form-item
+            label="预计出库日期"
+            span="1"
+            prop="predictDate"
+            class="deliverydate"
+          >
             <el-date-picker
               disabled
               v-model="dataList.predictDate"
@@ -213,12 +248,21 @@
               value-format="yyyy-MM-dd"
             />
           </el-form-item>
-          <!--经办人-->
-          <!-- <el-form-item label="出库经办人">
+          <!--预估运费（元/吨）-->
+          <el-form-item label="预估运费（元/吨）" span="1">
+            <el-input
+              v-model="dataList.estimatedFreight"
+              placeholder="请输入预估运费"
+              maxlength="20"
+              size="small"
+            />
+          </el-form-item>
+          <!--收货人-->
+          <el-form-item label="发货人">
             <el-select
               disabled
               v-model="dataList.agent"
-              placeholder="请选择经办人"
+              placeholder="请选择发货人"
               filterable
               @change="selectstaff"
             >
@@ -229,9 +273,13 @@
                 :value="item.staffName"
               />
             </el-select>
-          </el-form-item> -->
+          </el-form-item>
           <!--业务描述=-->
-          <el-form-item v-if="dataList.taskTypeKey != 3" label="业务描述" span="1">
+          <el-form-item
+            v-if="dataList.taskTypeKey != 3"
+            label="业务描述"
+            span="1"
+          >
             <el-input
               v-model="dataList.businessDescribe"
               placeholder="请输入业务描述，不超过150字"
@@ -241,13 +289,27 @@
             />
           </el-form-item>
           <el-form-item label="仓位号（选填）" span="1">
-            <el-input
+             <el-select
+              v-model="dataList.binNumber"
+              placeholder="请输入仓位号"
+              filterable
+              @change="binNumberChange1"
+            >
+              <el-option
+                v-for="(item, index) in binNumberList1"
+                :Key="index"
+                :label="item.binNumber"
+                :value="item.binNumber"
+              >
+              </el-option>
+            </el-select>
+            <!-- <el-input
               v-model="dataList.binNumber"
               placeholder="请输入仓位号"
               maxlength="150"
               size="large"
               class="yewu"
-            />
+            /> -->
           </el-form-item>
         </el-form>
       </div>
@@ -265,7 +327,12 @@
             <span v-if="deletetask" style="color: red">已删除</span>
           </h3>
         </div>
-        <el-form v-if="!deletetask" ref="form" :model="form" label-width="140px">
+        <el-form
+          v-if="!deletetask"
+          ref="form"
+          :model="form"
+          label-width="140px"
+        >
           <!-- 仓库名 -->
           <el-form-item label="仓库名" v-if="dataList1.inOutType == '移库入库'">
             <el-select
@@ -283,7 +350,10 @@
             </el-select>
           </el-form-item>
           <!-- 出库类型 -->
-          <el-form-item label="入库类型" v-if="dataList1.inOutType == '移库入库'">
+          <el-form-item
+            label="入库类型"
+            v-if="dataList1.inOutType == '移库入库'"
+          >
             <el-select
               disabled
               v-model="dataList1.inOutType"
@@ -356,7 +426,7 @@
             </el-select>
           </el-form-item>
           <!--重量（吨）-->
-          <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
+          <el-form-item label="重量（吨）">
             <el-input
               @input="weightchange"
               v-model="dataList1.weight"
@@ -396,7 +466,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=" span="1" style="margin-left: 350px; margin-top: -40px">
+          <el-form-item label="水分（%）<=">
             <el-input
               @input="waterContentchange"
               :disabled="dataList.taskTypeKey == 3"
@@ -408,7 +478,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)" span="1" style="margin-left: 650px; margin-top: -40px">
+          <el-form-item label="单价(元/吨)">
             <el-input
               @input="unitPricechange"
               :disabled="dataList.taskTypeKey == 3"
@@ -420,7 +490,12 @@
             />
           </el-form-item>
           <!--预计出库日期-->
-          <el-form-item label="预计入库日期" span="1" prop="predictDate" class="deliverydate">
+          <el-form-item
+            label="预计入库日期"
+            span="1"
+            prop="predictDate"
+            class="deliverydate"
+          >
             <el-date-picker
               disabled
               v-model="dataList1.predictDate"
@@ -429,14 +504,22 @@
               value-format="yyyy-MM-dd"
             />
           </el-form-item>
-          <!--经办人-->
-          <!-- <el-form-item label="入库经办人">
+          <!--预估运费（元/吨）-->
+          <el-form-item label="预估运费（元/吨）" span="1">
+            <el-input
+              v-model="dataList1.estimatedFreight"
+              placeholder="请输入预估运费"
+              maxlength="20"
+              size="small"
+            />
+          </el-form-item>
+          <!--收货人-->
+          <el-form-item label="收货人">
             <el-select
               disabled
               v-model="dataList1.agent"
-              placeholder="请选择经办人"
+              placeholder="请选择收货人"
               filterable
-             
               @change="selectstaff1"
             >
               <el-option
@@ -446,7 +529,7 @@
                 :value="item.staffName"
               />
             </el-select>
-          </el-form-item> -->
+          </el-form-item>
           <!--业务描述=-->
           <el-form-item v-if="dataList.taskTypeKey != 4" label="业务描述">
             <el-input
@@ -457,13 +540,27 @@
             />
           </el-form-item>
           <el-form-item label="仓位号（选填）" span="1">
-            <el-input
+            <el-select
+              v-model="dataList1.binNumber"
+              placeholder="请输入仓位号"
+              filterable
+              @change="binNumberChange"
+            >
+              <el-option
+                v-for="(item, index) in binNumberList"
+                :Key="index"
+                :label="item.binNumber"
+                :value="item.binNumber"
+              >
+              </el-option>
+            </el-select>
+            <!-- <el-input
               v-model="dataList1.binNumber"
               placeholder="请输入仓位号"
               maxlength="150"
               size="large"
               class="yewu"
-            />
+            /> -->
           </el-form-item>
         </el-form>
       </div>
@@ -569,7 +666,7 @@
             </el-select>
           </el-form-item>
           <!--重量（吨）-->
-          <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
+          <el-form-item label="重量（吨）">
             <el-input
               disabled
               v-model="dataList.weight"
@@ -608,7 +705,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=" span="1" style="margin-left: 350px; margin-top: -40px">
+          <el-form-item label="水分（%）<="
             <el-input
               disabled
               v-model="dataList.waterContent"
@@ -619,7 +716,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)" span="1" style="margin-left: 650px; margin-top: -40px">
+          <el-form-item label="单价(元/吨)">
             <el-input
               disabled
               v-model="dataList.unitPrice"
@@ -630,7 +727,12 @@
             />
           </el-form-item>
           <!--预计出库日期-->
-          <el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
+          <el-form-item
+            label="预计出库日期"
+            span="1"
+            prop="predictDate"
+            class="deliverydate"
+          >
             <el-date-picker
               v-model="dataList.predictDate"
               type="date"
@@ -638,13 +740,21 @@
               value-format="yyyy-MM-dd"
             />
           </el-form-item>
-          <!--经办人-->
-          <!-- <el-form-item label="出库经办人">
+          <!--预估运费（元/吨）-->
+          <el-form-item label="预估运费（元/吨）" span="1">
+            <el-input
+              v-model="dataList.estimatedFreight"
+              placeholder="请输入预估运费"
+              maxlength="20"
+              size="small"
+            />
+          </el-form-item>
+          <!--发货人-->
+          <el-form-item label="发货人">
             <el-select
               v-model="dataList.agent"
-              placeholder="请选择经办人"
+              placeholder="请选择发货人"
               filterable
-             
               @change="selectstaff"
             >
               <el-option
@@ -654,7 +764,7 @@
                 :value="item.staffName"
               />
             </el-select>
-          </el-form-item> -->
+          </el-form-item>
           <!--业务描述=-->
           <el-form-item label="业务描述">
             <el-input
@@ -670,11 +780,23 @@
 
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
-      <el-button class="bg-bottom" type="primary" size="small" @click="reject()">驳回</el-button>
-      <el-button class="bg-bottom" type="primary" size="small" @click="submit()">通过</el-button>
+      <el-button class="bg-bottom" type="primary" size="small" @click="reject()"
+        >驳回</el-button
+      >
+      <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
+        >通过</el-button
+      >
     </div>
-    <el-table class="wenzi" :data="taskhistories" style="width: 80%" height="180">
-      <el-table-column prop="operatorMajorRoleName" label="审核人"></el-table-column>
+    <el-table
+      class="wenzi"
+      :data="taskhistories"
+      style="width: 80%"
+      height="180"
+    >
+      <el-table-column
+        prop="operatorMajorRoleName"
+        label="审核人"
+      ></el-table-column>
       <el-table-column prop="inOutTaskNo" label="审核结果">
         <template scope="scope">
           <span v-if="scope.row.approved">通过</span>
@@ -684,7 +806,11 @@
       <el-table-column prop="createTime" label="审核时间"></el-table-column>
       <el-table-column prop="auditMind" label="驳回原因"></el-table-column>
     </el-table>
-    <WinseaContentModal v-model="outerVisible" title="驳回原因" @on-cancel="handleClose">
+    <WinseaContentModal
+      v-model="outerVisible"
+      title="驳回原因"
+      @on-cancel="handleClose"
+    >
       <el-input
         type="textarea"
         :rows="2"
@@ -707,7 +833,7 @@ import {
   getGoodsName,
   warehousetask,
   woekflowhandle,
-  gettaskhistories
+  gettaskhistories,
 } from '@/model/tasksport/index'
 import { pullDown, getstaff } from '@/model/warehouse/index'
 import Pagination from '@/components/Pagination'
@@ -719,7 +845,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    Pagination
+    Pagination,
   },
   watch: {
     // vesselId(val) {
@@ -727,10 +853,10 @@ export default {
     // },
     isShow(val) {
       this.showType = val
-    }
+    },
   },
   computed: {
-    ...mapGetters(['deptBudgetList'])
+    ...mapGetters(['deptBudgetList']),
   },
   data() {
     return {
@@ -787,9 +913,9 @@ export default {
             required: true,
             type: 'number',
             message: '请输入活动名称',
-            trigger: 'blur'
-          }
-        ]
+            trigger: 'blur',
+          },
+        ],
       },
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
@@ -797,7 +923,7 @@ export default {
       packtypeList: {},
       date: {
         year: dayjs().format('YYYY'),
-        month: dayjs().format('MM')
+        month: dayjs().format('MM'),
       },
       contractList: [],
       inOutTaskNo: '',
@@ -806,17 +932,26 @@ export default {
       dataList1: { taskTypeKey: '1' },
       historyList: [],
       pickerBeginDateBefore: {
-        disabledDate: time => {
+        disabledDate: (time) => {
           return time.getTime() > Date.now()
-        }
+        },
       },
-      accessoryTFs: false
+      binNumberList: [],
+      binNumberList1:[],
+      accessoryTFs: false,
     }
   },
   activated() {
     this.getList()
   },
   methods: {
+    // 仓位号改变
+    binNumberChange(e) {
+      this.dataList1.binNumber = e
+    },
+       binNumberChange1(e) {
+      this.dataList.binNumber = e
+    },
     //返回按钮
     revert() {
       this.$router.go(-1)
@@ -849,7 +984,7 @@ export default {
         if (i > 90) continue
         arr.push(String.fromCharCode(i))
       }
-      arr.sort(function() {
+      arr.sort(function () {
         return Math.random() - 0.5
       })
       arr.length = 4
@@ -873,7 +1008,7 @@ export default {
       this.deptBudgetList.staffList = val
       if (val) {
         //val存在
-        this.options = this.staffList.filter(item => {
+        this.options = this.staffList.filter((item) => {
           if (
             !!~item.staffName.indexOf(val) ||
             !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
@@ -918,10 +1053,10 @@ export default {
           if (this.contractNoList[i].contractNo == e) {
             getGoodsName({
               contractId: this.contractNoList[i].id,
-              contractNo: this.contractNoList[i].contractNo
+              contractNo: this.contractNoList[i].contractNo,
             })
               .toPromise()
-              .then(response => {
+              .then((response) => {
                 this.$set(this.dataList, 'goodsName', response.goodsName)
                 this.$set(this.dataList, 'goodsNameKey', response.goodsNameKey)
                 this.$set(this.dataList, 'grade', response.grade)
@@ -945,10 +1080,10 @@ export default {
           if (this.contractNoList[i].contractNo == e) {
             getGoodsName({
               contractId: this.contractNoList[i].id,
-              contractNo: this.contractNoList[i].contractNo
+              contractNo: this.contractNoList[i].contractNo,
             })
               .toPromise()
-              .then(response => {
+              .then((response) => {
                 this.$set(this.dataList1, 'goodsName', response.goodsName)
                 this.$set(this.dataList1, 'goodsNameKey', response.goodsNameKey)
                 this.$set(this.dataList1, 'grade', response.grade)
@@ -987,15 +1122,15 @@ export default {
         sessionStorage.getItem('ws-pf_staffName')
       warehousetask(list)
         .toPromise()
-        .then(response => {
+        .then((response) => {
           woekflowhandle({
             taskId: list.taskId,
             approved: true,
             auditMind: '34',
-            needReapply: false
+            needReapply: false,
           })
             .toPromise()
-            .then(response => {
+            .then((response) => {
               this.$message.success('审核成功')
               this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
             })
@@ -1003,18 +1138,20 @@ export default {
     },
     requestaudit(list, status) {
       list.compId = sessionStorage.getItem('ws-pf_compId')
-      list.publisher =sessionStorage.getItem('ws-pf_roleName') + sessionStorage.getItem('ws-pf_staffName')
+      list.publisher =
+        sessionStorage.getItem('ws-pf_roleName') +
+        sessionStorage.getItem('ws-pf_staffName')
       warehousetask(list)
         .toPromise()
-        .then(response => {
+        .then((response) => {
           woekflowhandle({
             taskId: list.taskId,
             approved: false,
             auditMind: this.auditMind,
-            needReapply: true
+            needReapply: true,
           })
             .toPromise()
-            .then(response => {
+            .then((response) => {
               this.$message.success('驳回成功')
               this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
             })
@@ -1044,7 +1181,7 @@ export default {
       if (!this.auditMind) {
         this.$message({
           message: '驳回原因不能为空！',
-          type: 'warning'
+          type: 'warning',
         })
         return
       }
@@ -1192,17 +1329,17 @@ export default {
     getList() {
       gettaskhistories({
         businessKey: this.$route.query.businessKey,
-        workflowId: this.$route.query.workflowId
+        workflowId: this.$route.query.workflowId,
       })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.taskhistories = response
         })
 
       if (this.$route.query.relevanceId) {
         outexamine({ relevanceId: this.$route.query.relevanceId })
           .toPromise()
-          .then(response => {
+          .then((response) => {
             if (response.length > 1) {
               if (response[0].taskTypeKey == 3) {
                 if (response[0].inOutType == '移库出库') {
@@ -1245,53 +1382,67 @@ export default {
       // 货名
       pullDown({ constId: 'CON2' })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.goodnameList = response
         })
       // 品级
       pullDown({ constId: 'CON3' })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.gradeList = response
         })
       pullDown({ constId: 'CON6' })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.storageType = response
         })
       pullDown({ constId: 'CON5' })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.storageType1 = response
         })
       xialaNo({
-        compId: this.compId
+        compId: this.compId,
       })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.contractNoList = response
         })
       //仓库名
       getwarehousename({
         compId: this.compId,
-        warehouseType: 1
+        warehouseType: 1,
       })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.warehouseNameList = response
+          for (let i = 0; i < this.warehouseNameList.length; i++) {
+            if (
+              this.dataList.warehouseName ==
+              this.warehouseNameList[i].warehouseName
+            ) {
+              this.binNumberList1 = this.warehouseNameList[i].positionInfos
+            }
+            if (
+              this.dataList1.warehouseName ==
+              this.warehouseNameList[i].warehouseName
+            ) {
+              this.binNumberList = this.warehouseNameList[i].positionInfos
+            }
+          }
         })
       getwarehousename({
         compId: this.compId,
-        warehouseType: 2
+        warehouseType: 2,
       })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.warehouseNameList1 = response
         })
       //经办人
       getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.options = response
           this.staffList = response
           //  this.agent = response
@@ -1321,7 +1472,7 @@ export default {
     handleExamine(row) {
       this.$router.push({
         name: 'salesContractExamine',
-        query: { id: row.id }
+        query: { id: row.id },
       })
     },
     // 关闭 dialog时 处理文件url 初始化upload组件
@@ -1332,11 +1483,11 @@ export default {
       console.log(row)
       billoperatehis({ id: row.id })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.historyList = response
         })
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>
@@ -1480,7 +1631,7 @@ export default {
   margin: 0;
 }
 .huom {
-  width: 100px;
+  width: 100%;
 }
 .el-form {
   font-size: 14px;

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -211,11 +211,16 @@
               value-format="yyyy-MM-dd"
             />
           </el-form-item>
-          <!--经办人-->
-          <!-- <el-form-item label="出库经办人">
+          		<!--预估运费（元/吨）-->
+					<el-form-item label="预估运费（元/吨）" span="1" >
+						<el-input  v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
+							maxlength="20" size="small"  />
+					</el-form-item>
+          <!--发货人-->
+          <el-form-item label="发货人">
             <el-select
               v-model="dataList.agent"
-              placeholder="请选择经办人"
+              placeholder="请选择发货人"
               filterable
              
               @change="selectstaff"
@@ -227,7 +232,7 @@
                 :value="item.staffName"
               />
             </el-select>
-          </el-form-item> -->
+          </el-form-item>
           <!--业务描述=-->
           <el-form-item v-if="dataList.taskTypeKey != 3" label="业务描述" span="1">
             <el-input
@@ -414,11 +419,16 @@
               value-format="yyyy-MM-dd"
             />
           </el-form-item>
-          <!--经办人-->
-          <!-- <el-form-item label="入库经办人">
+          		<!--预估运费（元/吨）-->
+					<el-form-item label="预估运费（元/吨）" span="1" >
+						<el-input v-model="dataList1.estimatedFreight" placeholder="请输入预估运费"
+							maxlength="20" size="small"  />
+					</el-form-item>
+          <!-- 经办人-->
+          <el-form-item label="收货人">
             <el-select
               v-model="dataList1.agent"
-              placeholder="请选择经办人"
+              placeholder="请选择收货人"
               filterable
              
               @change="selectstaff1"
@@ -430,7 +440,7 @@
                 :value="item.staffName"
               />
             </el-select>
-          </el-form-item> -->
+          </el-form-item>
           <!--业务描述=-->
           <el-form-item v-if="dataList.taskTypeKey != 4" label="业务描述">
             <el-input
@@ -613,11 +623,16 @@
               value-format="yyyy-MM-dd"
             />
           </el-form-item>
-          <!--经办人-->
-          <!-- <el-form-item label="出库经办人">
+          		<!--预估运费（元/吨）-->
+					<el-form-item label="预估运费（元/吨）" span="1" >
+						<el-input v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
+							maxlength="20" size="small"  />
+					</el-form-item>
+          <!--发货人-->
+          <el-form-item label="出库发货人">
             <el-select
               v-model="dataList.agent"
-              placeholder="请选择经办人"
+              placeholder="请选择发货人"
               filterable
              
               @change="selectstaff"
@@ -629,7 +644,7 @@
                 :value="item.staffName"
               />
             </el-select>
-          </el-form-item> -->
+          </el-form-item>
           <!--业务描述=-->
           <el-form-item label="业务描述">
             <el-input

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -114,7 +114,7 @@
               >审核中</el-button
             >
              <el-button
-             
+             v-else
               type="primary"
               size="small"
               @click="priceSubmit()"

src/views/warehouse/tranManagementWarehouseInOutTask.vue

@@ -80,7 +80,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="inOutTaskNo" label="任务编号"></el-table-column>
-        <el-table-column prop="contractNo" label="合同编号" width="80">
+        <el-table-column prop="contractNo" label="合同编号">
           <!-- <template scope="scope">
             <div
               v-if="

src/views/warehouse/warehouseManagementAdd.vue

@@ -221,7 +221,7 @@
         </div>
       </div>
       <div style="margin-bottom: 5px" class="small-title">仓库定位</div>
-      <map-drag  @marker="marker" @selectedAddress="selectedAddress" @provinceChange='provinceChange'></map-drag>
+      <map-drag  @marker="marker" @selectedAddress="selectedAddress" @provinceChange='provinceChange' @pickedAddress='getInfo'></map-drag>
     </ws-form>
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
@@ -342,6 +342,11 @@ export default {
     },
   },
   methods: {
+    getInfo(e){
+      console.log(e)
+      this.deptBudgetList.warehousePositioning = e.lat +','+e.lng
+      console.log(this.deptBudgetList.warehousePositioning)
+    },
     close(index) {
       this.addressUrls.splice(index, 1)
     },

src/views/warehouse/warehouseManagementGross.vue

@@ -1965,6 +1965,12 @@ export default {
       }
     },
     contractNoChange(e) {
+      for(let i = 0 ; i < this.deptBudgetList1.length ; i++){
+        if(this.deptBudgetList1[i].inOutTaskNo == e){
+         this.deptBudgetList.contractNo =  this.deptBudgetList1[i].contractNo
+         return
+        }
+      }
       for (var i = 0; i < this.outContractNo.length; i++) {
         if (this.outContractNo[i].contractNo == e) {
           if (this.outContractNo[i].inOutType == '采购入库') {

src/views/warehouse/warehouseManagementNoWeight.vue

@@ -236,6 +236,7 @@ export default {
             inOutFlag: row.inOutFlag,
             inOutType: row.inOutType,
             inOutTypeKey: row.inOutTypeKey,
+            inOutTaskNo:row.inOutTaskNo,
             netWeight: row.netWeight,
             positionId: row.positionId,
             statusFlag: row.statusFlag,

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -643,6 +643,7 @@ export default {
     this.dataList.deductionAmount=this.$route.query.deductionAmount/1000
     this.dataList.deductionWeight=this.$route.query.deductionWeight*1000
     this.dataList.inOutTypeFlag=1
+    this.dataList.inOutTaskNo = this.$route.query.inOutTaskNo
     if(this.dataList.cost){
       this.isGetCost = true
       this.cost = this.dataList.cost 
@@ -781,6 +782,12 @@ export default {
 
     },
     contractNoChange(e){
+      for(let i = 0 ; i < this.deptBudgetList2.length ; i++){
+        if(this.deptBudgetList2[i].inOutTaskNo == e){
+         this.dataList.contractNo = this.deptBudgetList2[i].contractNo
+         return
+        }
+      }
       for (var i = 0; i < this.outContractNo.length; i++) {
         if (this.outContractNo[i].contractNo == e) {
             if (this.outContractNo[i].inOutType == '采购入库') {

src/views/warehouse/warehouseManagementRecord.vue

@@ -92,7 +92,7 @@
 					<el-table-column prop="deductionWeight" label="扣重（吨）"> </el-table-column>
 					<el-table-column prop="netWeight" label="净重（吨）"></el-table-column>
 					<el-table-column prop="pureWeight" label="纯重（吨）"> </el-table-column>
-					<el-table-column width='120' prop="deductionAmount" label="扣款（元/吨）"> </el-table-column>
+					<el-table-column prop="deductionAmount" label="扣款（元/吨）" width="150"> </el-table-column>
 					<el-table-column prop="grade" label="品级" width="80px">
 						<template slot-scope="scope">
 							<span v-if="scope.row.grade == '一等品'" class="top-grade">{{
@@ -963,4 +963,7 @@
 	/deep/.ws-info-table .el-form-item .el-form-item__content {
 		border: 0px;
 	}
+	/deep/.el-table td , /deep/.el-table .el-table__header .cell{
+		text-align: center;
+	}
 </style>

src/views/warehouse/warehouseManagementTare.vue

@@ -635,6 +635,12 @@ export default {
 
     },
     contractNoChange(e){
+      for(let i = 0 ; i < this.deptBudgetList1.length ; i ++){
+        if(this.deptBudgetList1[i].inOutTaskNo == e){
+          this.deptBudgetList.contractNo = this.deptBudgetList1[i].contractNo
+          return
+        }
+      }
       for (var i = 0; i < this.outContractNo.length; i++) {
         if (this.outContractNo[i].contractNo == e) {
              if (this.outContractNo[i].inOutType == '销售出库') {

vue.config.js

@@ -143,6 +143,8 @@ module.exports = {
         // target: 'http://localhost:8090/',
         target: 'http://192.168.1.107:8090/',
         // target: 'http://192.168.1.115:8090/',
+        // target: 'http://192.168.1.107/:8090/',
+        // target: 'http://192.168.1.122:9100/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',