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

# Conflicts:
#	src/views/houseSelfCollect/acquisitionManagement.vue
#	src/views/houseSelfCollect/paymentManagement.vue

src/components/mapdrag/mapdrag.vue

@@ -4,7 +4,7 @@
   margin-top: 64px;
 }
 #mapContainer {
-  width: 300px;
+  width: 750px;
   height: 300px;
 }
 #tip {
@@ -83,6 +83,7 @@
 </template>
 
 <script>
+import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
 import image from '../../../public/img/ic_locationmarker.jpg'
 export default {
   data() {
@@ -95,6 +96,7 @@ export default {
       citys: [],
       city: '',
       polygons: [],
+      selectedOptions1:[],
       areacode: '',
       address: '',
       objPoint: [],
@@ -104,12 +106,26 @@ export default {
       status: true,
     }
   },
-  props: ['flagVisible', 'position'],
+  props: ['flagVisible', 'position','selectedOptions'],
   computed: {
     showFlag() {
       return this.flagVisible
     },
   },
+  watch: {
+    selectedOptions:{
+      handler(newValue, oldValue) {
+        console.log(CodeToText[newValue[1]])
+        this.province=newValue[0]
+        this.selectP(this.province)
+        this.city = CodeToText[newValue[1]]
+        this.selectC(CodeToText[newValue[1]])
+        this.district= newValue[2]
+        this.selectD(this.district)
+      },
+      deep: true
+    }
+  },
   async created() {
     // 已载入高德地图API，则直接初始化地图
     if (window.AMap && window.AMapUI) {
@@ -122,6 +138,7 @@ export default {
     }
   },
   mounted() {
+      // console.log(this)
     setTimeout(() => {
       var that = this
       this.map = new AMap.Map('mapContainer', {
@@ -270,6 +287,7 @@ export default {
         }
         var district = new AMap.DistrictSearch(opts) // 注意：需要使用插件同步下发功能才能这样直接使用
         function getData(data) {
+          console.log(data)
           that.$emit('selectedAddress', data)
           // 清除地图上的所有覆盖物
           that.areacode = data.citycode
@@ -306,19 +324,21 @@ export default {
         let sear = val ? params : '中国'
         district.search(sear, function (status, result) {
           if (status === 'complete') {
-            getData(result.districtList[0])
+              getData(result.districtList[0])
           }
         })
       })
     },
     selectP(val) {
       if (this.status) {
+        this.$emit('provinceChange', val)
         this.loadmap(val)
         this.city = ''
         this.district = ''
       }
     },
     selectC(val) {
+      console.log(val)
       if (this.status) {
         this.loadmap(val)
         this.district = ''

src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -1483,6 +1483,7 @@ export default {
             .toPromise()
             .then((response) => {
               this.$message.success('添加成功')
+              this.selectedOptions=[]
               this.deptBudgetList = {
                 deliverType: '1',
                 finalTradingVolume: 0,

src/views/contractManagement/purchaseContractAdd.vue

@@ -445,9 +445,9 @@
 
       <ws-info-table>
         <!--已付款（元）-->
-        <ws-form-item label="已付款（元）" span="1" prop="goodsNameKey">
+        <ws-form-item label="已付款（元）" span="1" prop="mildewGrain">
           <ws-input
-            v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
+            v-model="deptBudgetList.contractProcessInfo.mildewGrain"
             placeholder="请输入已付款（元）"
             maxlength="100"
             size="small"
@@ -609,6 +609,7 @@ export default {
 
       deptBudgetList: {
         deliverType: '1',
+        addressUrl:'',
         finalTradingVolume: 0,
         totalContractPrice:0,
         contractGoodsInfo: {
@@ -1344,6 +1345,7 @@ export default {
                   goodsName: '',
                 },
                 contractProcessInfo: {},
+                addressUrl:'',
               }
               this.$router.push({ path: 'buyContract' })
             })

src/views/contractManagement/purchaseContractExamine.vue

@@ -189,8 +189,8 @@
       </div>
       <ws-info-table>
          <!--已付款（元）-->
-        <ws-form-item label="已付款（元）" span="1" prop="goodsNameKey">
-          {{deptBudgetList.contractProcessInfo.goodsNameKey}}
+        <ws-form-item label="已付款（元）" span="1" prop="mildewGrain">
+          {{deptBudgetList.contractProcessInfo.mildewGrain}}
         </ws-form-item>
         <ws-form-item label="已开发票（元）" span="1" prop="goodsName">
           {{ deptBudgetList.contractProcessInfo.goodsName }}

src/views/contractManagement/salesContractEdit.vue

@@ -425,7 +425,7 @@
 
         <ws-info-table>
           <!--合同收入（元）-->
-          <ws-form-item label="合同收入（元）" span="1" prop="contractNo">
+          <ws-form-item label="合同收入（元）" span="1" prop="goodsNameKey">
             <ws-input
               v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
               placeholder="请输入合同收入（元）"

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -382,7 +382,6 @@
     mounted() {},
     methods: {
       paramTypeChange(e){
-        console.log(e)
         // this.makeTableList()
       },
       // 查看/编辑获取数据

src/views/houseSelfCollect/inspectionManagement.vue

@@ -92,7 +92,15 @@
       </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>
+      <el-table-column prop="qualityInspector" label="质检员">
+          <template scope="scope">
+            <span>{{scope.row.qualityInspector}}</span>
+            <span v-if="scope.row.reInspector && scope.row.qualityInspector != scope.row.reInspector">,{{scope.row.reInspector}}</span>
+          </template>
+
+
+
+      </el-table-column>
       <el-table-column prop="updateDate" label="质检时间"></el-table-column>
       <el-table-column prop="status" label="状态">
         <template slot-scope="scope">
@@ -107,7 +115,6 @@
       <el-table-column width="500" label="操作">
         <template slot-scope="scope">
           <el-button @click="inspectInfo(scope.row, 2)" v-hasPermission="`acquisitionManagement.acquisitionQuality.view`">查看</el-button>
-          
           <el-button @click="inspectInfo(scope.row, 3)" v-if="scope.row.status=='已初检'&& scope.row.confirm!='1'" v-hasPermission="`acquisitionManagement.acquisitionQuality.initial`">初检</el-button>
            <el-button @click="inspectInfo(scope.row, 5)" v-if="scope.row.confirm!='1' && scope.row.status=='已复检'" v-hasPermission="`acquisitionManagement.acquisitionQuality.con`">确认</el-button>
            <el-button @click="inspectInfo(scope.row, 4)" v-if="scope.row.confirm!='1'" v-hasPermission="`acquisitionManagement.acquisitionQuality.again`">复检</el-button>
@@ -171,6 +178,7 @@ export default {
       searchType: 0,
       warehouseName: '',
       inspect: [],
+      warehouseList1:[],
       warehouseList: [],
       cangid: '', //仓库id
       warehouseCount: '',
@@ -227,6 +235,11 @@ export default {
           this.WAREHOUSE[1].payname = this.warehouseList[i].value
         }
       }
+      for(let i = 0 ; i < this.warehouseList1.length; i++){
+        if(this.warehouseList1[i].warehouseName == e){
+           sessionStorage.setItem('houseSelfCollect_house',JSON.stringify(this.warehouseList[i]))
+        }
+      }
       this.getList()
     },
     del(row) {
@@ -272,26 +285,36 @@ export default {
       })
         .toPromise()
         .then((response) => {
+          this.warehouseList1=response
           this.warehouseList = []
+          let _wareHouse = sessionStorage.getItem('houseSelfCollect_house')
+          _wareHouse = JSON.parse(_wareHouse)
           for (let i = 0; i < response.length; i++) {
             this.warehouseList.push({
               value: response[i].warehouseName,
               id: response[i].id,
               count: response[i].count,
               No:response[i].commonWarehouseNo
-            })
+            })  
+            if (_wareHouse) {
+            this.cangid = _wareHouse.id
+            this.warehouseName = _wareHouse.warehouseName
+             this.warehouseNo =_wareHouse.commonWarehouseNo
+             this.warehouseCount = _wareHouse.count
+          } else {
             if (this.cangid&&this.cangid == response[i].id) {
               this.warehouseName = response[i].warehouseName
               this.warehouseCount =  response[i].count
               this.warehouseNo =  response[i].commonWarehouseNo
             } 
+            if(this.warehouseList.length > 0 && !this.cangid){
+              this.warehouseName = this.warehouseList[0].value
+              this.warehouseCount =  this.warehouseList[0].count
+              this.warehouseNo =  this.warehouseList[0].No
+              this.cangid =  this.warehouseList[0].id
+              this.WAREHOUSE[1].payname = this.warehouseList[0].value
+            }
           }
-          if(this.warehouseList.length > 0 && !this.cangid){
-            this.warehouseName = this.warehouseList[0].value
-            this.warehouseCount =  this.warehouseList[0].count
-            this.warehouseNo =  this.warehouseList[0].No
-            this.cangid =  this.warehouseList[0].id
-            this.WAREHOUSE[1].payname = this.warehouseList[0].value
           }
           this.getList()
         })

src/views/houseSelfCollect/paymentManagement.vue

@@ -28,10 +28,10 @@
       <template slot="left">
         <!-- <ws-button type="primary" @click="screen(2)">待结算</ws-button>
         <ws-button type="primary" @click="screen(0)">待审核</ws-button>
-        <ws-button type="primary"  @click="screen()">全部</ws-button>-->
-        <ws-button :type="searchType == 0 ? 'primary' : ''" @click="screen(0)">待审核</ws-button>
+        <ws-button type="primary"  @click="screen()">全部</ws-button> -->
+        <ws-button :type="searchType == 0 ? 'primary' : ''" @click="screen(1)" v-if="isShowAdopt" >待审核</ws-button >
         <ws-button :type="searchType == 2 ? 'primary' : ''" @click="screen(2)">待结算</ws-button>
-        <ws-button :type="searchType == -1 ? 'primary' : ''" @click="screen(-1)">全部</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="handlepass" v-if="isShowAdopt">审核</ws-button> -->
@@ -124,23 +124,23 @@
       <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="350">
         <template scope="scope">
           <el-button
-            v-show="(!scope.row.approveStatus || scope.row.approveStatus == '待结算')&& scope.row.status == '待结算'"
+            v-if="(!scope.row.approveStatus || scope.row.approveStatus == '待结算')&& scope.row.status == '待结算'"
             @click="settlement(1, scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.add`"
           >结算</el-button>
           <el-button
-            v-show="scope.row.approveStatus || scope.row.status == '已驳回'"
+            v-if="scope.row.approveStatus || scope.row.status == '已驳回'"
             @click="settlement(2, scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.view`"
           >查看</el-button>
           <el-button
-            v-show="scope.row.approveStatus || (scope.row.status != '待结算'&& !scope.row.approveStatus) "
+            v-if="scope.row.approveStatus || (scope.row.status != '待结算'&& !scope.row.approveStatus) "
             @click="print(scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.print`"
           >打印</el-button>
           <el-button
             type="danger"
-            v-show="(!scope.row.approveStatus || scope.row.approveStatus == '待结算')&& scope.row.status == '待结算'"
+            v-if="(!scope.row.approveStatus || scope.row.approveStatus == '待结算')&& scope.row.status == '待结算'"
             @click="del(scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.delete`"
           >删除</el-button>
@@ -384,19 +384,25 @@ export default {
       }
     },
     getWarehouse() {
+      let _wareHouse = sessionStorage.getItem('houseSelfCollect_house')
+      _wareHouse = JSON.parse(_wareHouse)
       selectWarehouseSelf({
         compId: sessionStorage.getItem('ws-pf_compId')
       })
         .toPromise()
         .then(response => {
           this.warehouseList = response
-          console.log(this.WAREHOUSE[3].payname)
-          this.warehouseNameKey = this.warehouseList[0].id
-          if (this.warehouseName) {
-            this.warehouseNameKey = this.WAREHOUSE[3].payname
+           if (_wareHouse) {
+            this.warehouseNameKey = _wareHouse.id
+            this.warehouseName = _wareHouse.warehouseName
           } else {
-            this.WAREHOUSE[3].payname = this.warehouseList[0].id
-            this.warehouseName = this.warehouseList[0].warehouseName
+          this.warehouseNameKey = this.warehouseList[0].id
+            if (this.warehouseName) {
+              this.warehouseNameKey = this.WAREHOUSE[3].payname
+            } else {
+              this.WAREHOUSE[3].payname = this.warehouseList[0].id
+              this.warehouseName =  this.warehouseList[0].warehouseName
+            }
           }
           this.getList()
         })
@@ -444,22 +450,22 @@ export default {
           this.paymentList = response
           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
-            }
-          }
-        })
+        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
+    //         }
+    //       }
+    //     })
     },
     del(row) {
       this.$confirm(
@@ -711,6 +717,7 @@ export default {
       for (let i = 0; i < this.warehouseList.length; i++) {
         if (this.warehouseList[i].id == this.warehouseNameKey) {
           this.warehouseName = this.warehouseList[i].warehouseName
+          sessionStorage.setItem('houseSelfCollect_house',JSON.stringify(this.warehouseList[i]))
           this.WAREHOUSE[3].payname = this.warehouseList[i].id
         }
       }

src/views/houseSelfCollect/settlement.vue

@@ -69,11 +69,14 @@
                 <ws-input v-model="paymentList.qualityInspectionManagement.natureOfGrainPurchase" placeholder="请输入购粮性质" maxlength="100" size="small" disabled />
             </ws-form-item>
              <ws-form-item v-if='paymentList.type=="干粮"' label="干粮单价（元/公斤）" span="1" prop="waterContent">
-                <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.qualityInspectionManagement.dryGrainPrice" placeholder="请输入干粮单价" maxlength="100" size="small" disabled />
+                <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.qualityInspectionManagement.dryGrainPrice" placeholder="请输入干粮单价" maxlength="100" size="small" />
             </ws-form-item>
              <ws-form-item v-if='paymentList.type=="干粮"' label="净重（公斤）" span="1" prop="waterContent">
                 <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.netWeight" placeholder="请输入净重" maxlength="100" size="small" disabled />
             </ws-form-item>
+            <ws-form-item  v-if='paymentList.type=="干粮"' label="扣单价（元/公斤）" span="1" prop="unitDeduction">
+              <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.unitDeduction" @input="grainMoney" placeholder="请输入扣单价" maxlength="100" size="small" :disabled="disabled"/>
+            </ws-form-item>
           </ws-info-table>
           <div class="titles">质检数据</div>
           <ws-info-table>
@@ -161,7 +164,10 @@
               />
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮" && paymentList.qualityInspectionManagement.paramType == "1"' label="扣重" span="1" prop="waterContent">
-              <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.qualityInspectionManagement.weightDeduction" placeholder="请输入扣重" maxlength="100" size="small" disabled/>
+              <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.weightDeduction" placeholder="请输入扣重" maxlength="100" size="small" disabled/>
+            </ws-form-item>
+            <ws-form-item v-if='paymentList.type=="潮粮" && paymentList.qualityInspectionManagement.paramType == "2"' label="扣重（公斤）" span="1" prop="waterContent">
+              <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.weightDeduction" placeholder="请输入扣重" maxlength="100" size="small" disabled/>
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮" && paymentList.qualityInspectionManagement.paramType != 1' label="掉水(%)" span="1" prop="waterContent" >
               <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.qualityInspectionManagement.waterContent-paymentList.qualityInspectionManagement.waterMin" placeholder="请输入掉水" maxlength="100" size="small" disabled/>

src/views/houseSelfCollect/weighingManagement.vue

@@ -250,12 +250,15 @@ export default {
       this.getList()
     },
     selectWarehouse(){
+      let _wareHouse = sessionStorage.getItem('houseSelfCollect_house')
+      _wareHouse = JSON.parse(_wareHouse)
       selectWarehouseSelf({
         compId: sessionStorage.getItem('ws-pf_compId'),
       })
         .toPromise()
         .then((response) => {
           this.warehouseList = []
+          
           for (let i = 0; i < response.length; i++) {
             this.warehouseList.push({
               value: response[i].warehouseName,
@@ -264,6 +267,16 @@ export default {
               monitorUrl1:response[i].monitorUrl1,
               monitorUrl2:response[i].monitorUrl2
             })
+             if (_wareHouse) {
+            
+            this.cangid = _wareHouse.id
+            this.warehouseName = _wareHouse.warehouseName
+            this.common.name=_wareHouse.warehouseName
+            this.warehouseId=_wareHouse.id
+             this.warehouseNo =_wareHouse.commonWarehouseNo
+             this.monitorUrl1=_wareHouse.monitorUrl1
+             this.monitorUrl2=_wareHouse.monitorUrl2
+          } else {
             if (this.cangid&&this.cangid == response[i].id) {
               this.warehouseName = response[i].warehouseName
               this.allowEdit = response[i].allowEdit
@@ -273,7 +286,7 @@ export default {
               this.monitorUrl1 =  response[i].monitorUrl1
               this.monitorUrl2 =  response[i].monitorUrl2
             }
-          }
+         
            if(this.warehouseList.length > 0 && !this.cangid){
             this.warehouseName = this.warehouseList[0].value
             this.cangid =  this.warehouseList[0].warehouseId
@@ -282,8 +295,11 @@ export default {
             this.common.name  =  this.warehouseList[0].value
             this.monitorUrl1 =  this.warehouseList[0].monitorUrl1
             this.monitorUrl2 =  this.warehouseList[0].monitorUrl2
+            } 
+          }
           }
            sessionStorage.setItem('ck',this.common.name)
+           console.log(this.warehouseList)
          this.getList()
         })
     },

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -645,8 +645,6 @@ export default {
     },
     //定金
     amendconfirm() {
-      this.contractManagementInfo.deposit = this.orderList.deposit 
-      this.contractManagementInfo.depositUrl = this.depositUrl
       this.$confirm(`确定提交定金信息？`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
@@ -657,8 +655,7 @@ export default {
             this.contractManagementInfoList.id = this.contractNoList[i].id
           }
         }
-        //  this.contractManagementInfoList.deposit = this.deposit
-        // this.$set(this.contractManagementInfoList,'deposit',this.deposit)
+        this.contractManagementInfoList.deposit = this.orderList.deposit 
         this.contractManagementInfoList.depositUrl = this.depositUrl
         addDisOrRemarks(this.contractManagementInfoList)
           .toPromise()
@@ -1009,6 +1006,7 @@ export default {
           this.contractNoList = response
           this.option = this.contractNoList
        this.contractNo = this.option[0].contractNo
+       this.contractchange(this.contractNo)
        this.getList()
         })
     },

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -380,7 +380,7 @@
 				this.collectForm1 = true
 			},
 			adoptRemarks() {
-				this.remarkInformation.remark = this.orderList.remark
+				// this.remarkInformation.remark = this.orderList.remark
 				this.$confirm(`确定要保存备注信息？`, {
 						confirmButtonText: '确定',
 						cancelButtonText: '取消',
@@ -392,7 +392,7 @@
 								this.remarkInformationList.id = this.contractNoList[i].id
 							}
 						}
-						this.remarkInformationList.remark = this.remark
+						this.remarkInformationList.remark = this.orderList.remark
 						disOrRemarks(this.remarkInformationList)
 							.toPromise()
 							.then(() => {

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -21,9 +21,13 @@
       <div class="nav">
         <span class="ziti">
           任务类型：
-          <h1 class="ziti1" v-show="dataList.inOutType == '移库入库'||dataList.inOutType == '移库出库'"> 移库任务</h1>
+          <h1 class="ziti1" v-show="dataList.taskTypeKey == '3'||dataList1.taskTypeKey == '3'"> 移库任务</h1>
+          <h1 class="ziti1"  v-show="dataList.taskTypeKey == '4'||dataList1.taskTypeKey == '4'"> 退库并出库任务</h1>
+          <h1 class="ziti1" v-show="dataList.taskTypeKey == '1'||dataList1.taskTypeKey == '1'"> 出库任务</h1>
+          <h1 class="ziti1"  v-show="dataList.taskTypeKey == '2'||dataList1.taskTypeKey == '2'"> 入库任务</h1>
+          <!-- <h1 class="ziti1" v-show="dataList.inOutType == '移库入库'||dataList.inOutType == '移库出库'"> 移库任务</h1>
           <h1 class="ziti1" 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>
+          <h1 class="ziti1" v-show="dataList.inOutType == '采购入库'||dataList.inOutType == '暂存入库'||dataList.inOutType == '贸易服务入库'||dataList.inOutType == '退库'"> 入库任务</h1> -->
         </span>
       </div>
       <div class="nav2"></div>
@@ -67,22 +71,14 @@
               :value="item.constValue"
             />
             {{dataList.inOutType}}
-            <!-- </el-select> -->
           </el-form-item>
           <!-- 合同编号 -->
-          <el-form-item label="合同编号">
-            <!-- <el-option
-              v-for="item in contractNoList"
-              :key="item.constKey"
-              :label="item.contractNo"
-              :value="item.contractNo"
-            ></el-option> -->
-            
-            {{dataList.moveTaskNo}}
-            {{dataList.contractNo}}
-            <div v-if="dataList.inOutType == '移库入库' || dataList.inOutType == '移库出库'">  {{dataList.moveTaskNo}}</div>
+          <el-form-item label="移库任务编号" v-if="dataList.inOutType == '移库入库' || dataList.inOutType == '移库出库'">
+            <div>  {{dataList.moveTaskNo}}</div>
             <div v-if="dataList.inOutType != '移库入库' || dataList.inOutType != '移库出库'">  {{dataList.contractNo}}</div>
-            <!-- </el-select> -->
+          </el-form-item>
+           <el-form-item label="合同编号" v-else>
+            <div>  {{dataList.contractNo}}</div>
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">
@@ -183,15 +179,12 @@
             <!-- </el-select> -->
           </el-form-item>
           <!-- 合同编号 -->
-          <el-form-item label="合同编号">
-            <!-- <el-option
-              v-for="item in contractNoList"
-              :key="item.constKey"
-              :label="item.contractNo"
-              :value="item.contractNo"
-            ></el-option> -->
-               <div v-if="dataList.inOutType == '移库入库' || dataList.inOutType == '移库出库'">  {{dataList.moveTaskNo}}</div>
+           <el-form-item label="移库任务编号" v-if="dataList.inOutType == '移库入库' || dataList.inOutType == '移库出库'">
+            <div>  {{dataList.moveTaskNo}}</div>
             <div v-if="dataList.inOutType != '移库入库' || dataList.inOutType != '移库出库'">  {{dataList.contractNo}}</div>
+          </el-form-item>
+           <el-form-item label="合同编号" v-else>
+            <div>  {{dataList.contractNo}}</div>
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">
@@ -377,7 +370,7 @@
             <span v-if='!scope.row.approved'>驳回</span>
           </template>
         </el-table-column>
-        <el-table-column prop="createTime" label="审核时间"></el-table-column>
+        <el-table-column prop="endTime" label="审核时间"></el-table-column>
         <el-table-column prop="auditMind" label="驳回原因"></el-table-column>
      </el-table>
     </div>
@@ -853,7 +846,7 @@ export default {
   line-height: 20px;
   margin-left: 381px;
   margin-top: -21px;
-  width: 100px;
+  width: 116px;
 }
 .winseaview-view {
   padding: 0 0 20px;

src/views/taskManagement/moveWarehouseTask.vue

@@ -66,9 +66,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="weight" label="出库量（吨）">
+        <el-table-column prop="deliveryVolume" label="出库量（吨）">
         </el-table-column>
-        <el-table-column prop="weightIn" label="入库量（吨）">
+        <el-table-column prop="storageVolume" label="入库量（吨）">
         </el-table-column>
         <el-table-column prop="stockReturnCount" label="退库量（吨）">
            <template slot-scope="scope">

src/views/tranManagement/tranManagementFireFeedback.vue

@@ -212,7 +212,7 @@
                   class="bg-bottom"
                   type="primary"
                   size="small"
-                  @click="submit(deptBudgetList)"
+                  @click="submit(index)"
                 >提交</el-button>
               </div>
             </span>
@@ -590,8 +590,8 @@ export default {
         }
       })
     },
-    submit() {
-      for (var i = 0; i < this.freightspace.length; i++) {
+    submit(index) {
+      // for (var i = 0; i < this.freightspace.length; i++) {
           // if (!this.freightspace[i].driver) {
           //   this.$message({
           //     message: '司机姓名不能为空！',
@@ -613,7 +613,7 @@ export default {
           //   })
           //   return
           // }
-          if (!this.freightspace[i].loadNetWeight) {
+          if (!this.freightspace[index].loadNetWeight) {
             this.$message({
               message: '装车净重不能为空！',
               type: 'warning'
@@ -621,8 +621,8 @@ export default {
             return
           }
           if (
-            this.freightspace[i].loadNetWeight < 0 ||
-            this.freightspace[i].loadNetWeight > 10000
+            this.freightspace[index].loadNetWeight < 0 ||
+            this.freightspace[index].loadNetWeight > 10000
           ) {
             this.$message({
               message: '装车净重输入错误！',
@@ -630,7 +630,7 @@ export default {
             })
             return
           }
-          if (!this.freightspace[i].loadingDate) {
+          if (!this.freightspace[index].loadingDate) {
             this.$message({
               message: '装车日期不能为空！',
               type: 'warning'
@@ -638,7 +638,7 @@ export default {
             return
           }
         
-      }
+      // }
       if (sessionStorage.getItem('sh-msg')) {
         this.validateFunc()
       } else {

src/views/tranManagement/tranManagementFireReceivingFeedback.vue

@@ -191,13 +191,13 @@
                 </el-upload>
                 <span
                   v-if="
-                    deptBudgetList.tranCarInfoList[index].unloadPoundImg != null
+                    item.unloadPoundImg != null
                   "
                   >1</span
                 >
                 <span
                   v-if="
-                    deptBudgetList.tranCarInfoList[index].unloadPoundImg == null
+                    item.unloadPoundImg == null
                   "
                   >未上传</span
                 >
@@ -386,7 +386,7 @@ export default {
         {
           boxNo: '',
           unloadNetWeight: '',
-          unloadPoundImg: '',
+          unloadPoundImg: null,
           unloadingDate: '',
         },
         // {loadPoundImg:{}},

src/views/tranManagement/tranManagementShippingFeedback.vue

@@ -121,7 +121,7 @@
           <el-button type="primary">导入</el-button>
         </el-upload>
       </div>
-      <div class="liaison">
+      <div class="liaison" v-if="this.deptBudgetList.tranCarInfoList.length>0">
         <div
           style="width: 100%"
           class="flex position"
@@ -234,7 +234,7 @@
           </ws-info-table>
         </div>
       </div>
-      <div class="yd-bottom">
+      <div v-if="this.deptBudgetList.tranCarInfoList.length>0" class="yd-bottom">
        
         <ws-form-item label="运单：" span="1" prop="loadPoundImg" class="yd-bottom-left" v-if="freightspace[0].status == '已装车'">
           <!-- slot-scope="scope" -->
@@ -266,7 +266,7 @@
           </template>
         </ws-form-item>
 
-        <div style="text-align: right; color: #8890b1; font-size: 16px">
+        <div style="text-align: right; color: #8890b1; font-size: 16px;width:100%;">
           合计(吨)：{{ total }}/{{ deptBudgetList.weight }}
           <!--阶段状态-->
           <span class="noservice" v-show="deptBudgetList.feedbackStatus == '执行中'">未完货</span>
@@ -276,7 +276,9 @@
           >{{ deptBudgetList.feedbackStatus }}</span>
         </div>
       </div>
-
+      <div v-if="this.deptBudgetList.tranCarInfoList.length==0">
+          暂无船次
+      </div>
       <!--运单-->
       <!-- <div
           style="width: 100%"
@@ -756,7 +758,9 @@ export default {
             this.deptBudgetList.shipType = response.tranCarInfoList[0].shipType
             this.deptBudgetList.boxNumber = response.tranCarInfoList[0].boxNumber
             //上传附件计数
-            this.pictureTotal =  this.deptBudgetList.tranCarInfoList[0].loadPoundImg.split(",").length
+            if(this.deptBudgetList.tranCarInfoList[0].loadPoundImg){
+              this.pictureTotal =  this.deptBudgetList.tranCarInfoList[0].loadPoundImg.split(",").length
+            }
             this.freightspace = response.tranCarInfoList
           }
 

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -234,10 +234,10 @@
                     alt
                   />
                 </el-upload>
-                <span v-if="deptBudgetList.tranCarInfoList[index].loadPoundImg != null ">1</span>
+                <span v-if="item.loadPoundImg != null ">1</span>
                 <span
                   v-if="
-                    deptBudgetList.tranCarInfoList[index].loadPoundImg == null
+                    item.loadPoundImg == null
                   "
                 >未上传</span>
               </template>
@@ -376,7 +376,7 @@ export default {
           driverPhone: '',
           carNo: '',
           loadNetWeight: '',
-          loadPoundImg: ''
+          loadPoundImg: null
         }
         // {loadPoundImg:{}},
       ],

src/views/warehouse/warehouseManagementAdd.vue

@@ -190,6 +190,7 @@
     <ws-form ref="deptBudgetList" :model="deptBudgetList">
       <div class="small-title" v-show="radio == 1">上传仓库照片</div>
       <el-upload
+      ref='upload'
         action="https://www.zthymaoyi.com/upload/admin"
         :show-file-list="false"
         :on-success="
@@ -221,7 +222,7 @@
         </div>
       </div>
       <div style="margin-bottom: 5px" class="small-title">仓库定位</div>
-      <map-drag @marker="marker" @selectedAddress="selectedAddress"></map-drag>
+      <map-drag  @marker="marker" @selectedAddress="selectedAddress" @provinceChange='provinceChange'></map-drag>
     </ws-form>
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
@@ -387,6 +388,9 @@ export default {
       this.deptBudgetList.warehousePositioning =
         e.center.lat + ',' + e.center.lng
     },
+    provinceChange(e){
+      console.log(CodeToText[e])
+    },
     confirmPositioncity() {
       this.listDate.level = 'city'
       this.listDate.country = this.name
@@ -545,8 +549,9 @@ export default {
                   .then((response) => {
                     this.$message.success('添加成功')
                     this.deptBudgetList = {}
-                    this.freightspace = {}
+                    this.freightspace = [{ binNumber: '', maxStorage: '', remark: '' }]
                     this.selectedOptions = ''
+                    this.addressUrls=[]
                     this.$router.push({ path: 'warehouseManagementList' })
                   })
               } else {
@@ -643,7 +648,8 @@ export default {
                   .then((response) => {
                     this.$message.success('添加成功')
                     this.deptBudgetList = {}
-                    this.freightspace = {}
+                    this.freightspace = [{ binNumber: '', maxStorage: '', remark: '' }]
+                     this.addressUrls=[]
                     this.selectedOptions = ''
                     this.$router.push({ path: 'warehouseManagementList' })
                   })

src/views/warehouse/warehouseManagementDelivery.vue

@@ -264,10 +264,10 @@
             size="small"
           />
         </ws-form-item> -->
-             <ws-form-item label="自检员" span="1" prop="qualityInspector">
+             <ws-form-item label="质检员" span="1" prop="qualityInspector">
             <el-select
               v-model="deptBudgetList.warehouseInOutDetail.qualityInspector"
-              placeholder="请选择自检员"
+              placeholder="请选择质检员"
               filterable
               clearable
               @change="qualityInspectorChange"

src/views/warehouse/warehouseManagementEdit.vue

@@ -217,6 +217,7 @@
           </div>
         <div class="small-title">仓库定位</div>
         <map-drag
+        :selectedOptions='selectedOptions'
           @marker="marker"
           @selectedAddress="selectedAddress"
         ></map-drag>

src/views/warehouse/warehouseManagementLook.vue

@@ -1,3 +1,4 @@
+<!--仓库详情-->
 <template>
   <div class="container">
     <el-row>

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -341,10 +341,10 @@
             size="small"
           />
         </ws-form-item> -->
-           <ws-form-item label="自检员" span="1" prop="qualityInspector">
+           <ws-form-item label="质检员" span="1" prop="qualityInspector">
             <el-select
               v-model="dataList.warehouseInOutDetail.qualityInspector"
-              placeholder="请选择自检员"
+              placeholder="请选择质检员"
               filterable
               clearable
                :filter-method="dataFilter"

src/views/warehouse/warehouseManagementPut.vue

@@ -425,10 +425,10 @@
           />
         </ws-form-item> -->
                  
-        <ws-form-item label="自检员" span="1" prop="qualityInspector">
+        <ws-form-item label="质检员" span="1" prop="qualityInspector">
             <el-select
               v-model="deptBudgetList.warehouseInOutDetail.qualityInspector"
-              placeholder="请选择自检员"
+              placeholder="请选择质检员"
               filterable
               clearable
               @change="qualityInspectorChange"
@@ -918,7 +918,7 @@ export default {
         })
         return
       }
-      if (!this.deptBudgetList.deductionAmount) {
+      if (!String(this.deptBudgetList.deductionAmount)) {
         this.$message({
           message: '扣款不能为空',
           type: 'warning',
@@ -960,7 +960,7 @@ export default {
         })
         return
       }
-      if (!this.deptBudgetList.freight) {
+      if (!String(this.deptBudgetList.freight)) {
         this.$message({
           message: '运费不能为空',
           type: 'warning',

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.122:8090/',
+        target: 'http://192.168.1.107:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',