浏览代码

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

gjy 3 年之前
父节点
当前提交
d6a40fcb39

+ 5 - 3
public/static/inspection.html

@@ -19,8 +19,8 @@
 
       .content {
         width: 1000px;
-        height: 583px;
-        margin: auto;
+        padding: 30px 20px 20px 20px;
+        font-size: 18px;
         position: absolute;
         top: 0;
         bottom: 0;
@@ -66,7 +66,8 @@
 
       .title {
         text-align: center;
-        font-size: 24px;
+    font-size: 36px;
+    font-weight: 500;
       }
 
       .number {
@@ -117,6 +118,7 @@
   <body>
     <div id="app">
       <div class="content" v-if="bigContent">
+        <div class="title">{{tableData.compName}}</div>
         <div class="title">粮食质检单</div>
         <div class="number">{{tableData.qualityNo}}</div>
         <table class="table">

+ 149 - 233
src/components/mapdrag/warehouseReceiptMap.vue

@@ -1,6 +1,8 @@
 <style lang='scss' scoped>
   .mapContent {
     position: relative;
+    height: 95%;
+    transition:.5s;
     .center-add {
       position: absolute;
       top: 0;
@@ -16,103 +18,14 @@
 
   #mapContainer {
     width: 100%;
-    height: 330px;
+    height: 100%;
   }
-
-  // #tip {
-  //   position: absolute;
-  //   top: -45px;
-  //   display: flex;
-  // }
-
-  // #tip .el-input {
-  //   // width: 179px;
-  //   margin-right: 0px;
-  // }
-
-  // #tip .el-select {
-  //   margin-right: 10px;
-  // }
-
-  // #tip .el-select {
-  //   width: 179px;
-  // }
-
-  // #tip .el-textarea {
-  //   width: 179px;
-
-  //   /deep/ .el-textarea__inner {
-  //     height: 40px;
-  //     resize: none;
-  //   }
-  // }
-
-  // .el-button--primary {
-  //   background-color: #5878e8;
-  //   border-color: #5878e8;
-  // }
-
-  // .el-button--default {
-  //   color: #5878e8;
-  //   border-color: #5473e8;
-  // }
-
-  // .address {
-  //   display: flex;
-  //   align-items: center;
-  //   margin-right: 20px;
-
-  //   // position:absolute;
-  //   // top: -35px;
-  //   .address-input {
-  //     display: inline-block;
-  //     width: 480px;
-  //   }
-  // }
 </style>
 
 <template>
   <div class="mapContent">
+    <div class="fixed">{{clickData}}</div>
     <div id="mapContainer"></div>
-    <!-- <div id="tip" v-show="showFlag === false ? false : true">
-      <el-select v-model="province" @change="selectP" placeholder="省">
-        <el-option
-          v-for="item in provinces"
-          :key="item.adcode"
-          :label="item.name"
-          :value="item.adcode"
-        >
-        </el-option>
-      </el-select>
-      <el-select v-model="city" @change="selectC" placeholder="市">
-        <el-option
-          v-for="item in citys"
-          :key="item.adcode"
-          :label="item.name"
-          :value="item.name"
-        >
-        </el-option>
-      </el-select>
-      <el-select v-model="district" @change="selectD" placeholder="区">
-        <el-option
-          v-for="item in districts"
-          :key="item.adcode"
-          :label="item.name"
-          :value="item.adcode"
-        >
-        </el-option>
-      </el-select>
-      <div class="address">
-        <el-input type="text" id="searchValue" placeholder="请输入关键字:" v-model="address" clearable class="address-input">
-        </el-input>
-      </div>
-      <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>
-    </div> -->
-
-
   </div>
 </template>
 
@@ -126,6 +39,7 @@
   export default {
     data() {
       return {
+        clickData:{},
         map: null,
         provinces: [],
         province: '',
@@ -186,164 +100,111 @@
           dragEnable: this.dragEnable,
         })
         this.map.on('click', function(e) {
-          if (this.status) {
-            var marker = new AMap.Marker({
-              position: new AMap.LngLat(e.lnglat.getLng(), e.lnglat
-                .getLat()), // 经纬度对象,也可以是经纬度构成的一维数组[116.39, 39.9]
-            })
-            that.map.remove(that.markers)
-            that.$emit('marker', e)
-            that.markers.push(marker)
-            // 将创建的点标记添加到已有的地图实例:
-            that.map.add(marker)
-          }
+          // if (this.status) {
+          //   var marker = new AMap.Marker({
+          //     position: new AMap.LngLat(e.lnglat.getLng(), e.lnglat.getLat()), // 经纬度对象,也可以是经纬度构成的一维数组[116.39, 39.9]
+          //   })
+          //   that.map.remove(that.markers)
+          //   that.$emit('marker', e)
+          //   that.markers.push(marker)
+          //   // 将创建的点标记添加到已有的地图实例:
+          //   that.map.add(marker)
+          // }
         })
         this.marker = new AMap.Marker({
           icon: new AMap.Icon({
-            size: new AMap.Size(0, 0),
-            image: image,
+            size: new AMap.Size(20, 20),
+            image: 'https://webapi.amap.com/theme/v1.3/markers/n/mark_b.pngimage',
           }),
-          map: that.map,
+            // icon: "https://webapi.amap.com/theme/v1.3/markers/n/mark_b.png",
+        position: [122.31016,40.670552]
         })
         AMap.plugin(
           ['AMap.Autocomplete', 'AMap.PlaceSearch', 'AMap.Geocoder', 'AMap.DistrictSearch'],
           function() {
-            var autocomplete = new AMap.Autocomplete({
-              input: 'searchValue',
-            })
-            var placeSearch = new AMap.PlaceSearch({
-              city: that.acode,
-              citylimit: true,
-              pageSize: 1,
-              pageIndex: 1,
-              map: that.map,
-            })
-            var districtSearch = new AMap.DistrictSearch({
-              subdistrict: 1,
-              level: 'city',
-              showbiz: false,
-            });
+            // var autocomplete = new AMap.Autocomplete({
+            //   input: 'searchValue',
+            // })
+            // var placeSearch = new AMap.PlaceSearch({
+            //   city: that.acode,
+            //   citylimit: true,
+            //   pageSize: 1,
+            //   pageIndex: 1,
+            //   map: that.map,
+            // })
+            // var districtSearch = new AMap.DistrictSearch({
+            //   subdistrict: 1,
+            //   level: 'city',
+            //   showbiz: false,
+            // });
 
-            AMap.event.addListener(autocomplete, 'select', function(e) {
-              that.marker.setMap(that.map)
-              if (e.poi.location) {
-                placeSearch.search() // 关键字查询查询
-                that.marker.setPosition(e.poi.location)
-                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
-                    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.poi.location.lat
-                    obj.lng = e.poi.location.lng
-                    that.$emit('searchAddress', obj)
-                  } else {
-                    that.$emit('searchAddress', '')
-                  }
-                  that.map.setFitView()
-                })
-              } else {
-                districtSearch.search(e.poi.name, (status, result1) => {
-                  if (status == 'complete') {
-                    that.marker.setPosition(result1.districtList[0].center)
-                    geocoder.getAddress(result1.districtList[0].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 = result1.districtList[0].center.lat
-                        obj.lng = result1.districtList[0].center.lng
-                        that.$emit('searchAddress', obj)
-                      } else {
-                        that.$emit('searchAddress', '')
-                      }
-                      that.map.setFitView()
-                    })
+            // AMap.event.addListener(autocomplete, 'select', function(e) {
+            //   that.marker.setMap(that.map)
+            //   if (e.poi.location) {
+            //     placeSearch.search() // 关键字查询查询
+            //     that.marker.setPosition(e.poi.location)
+            //     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
+            //         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.poi.location.lat
+            //         obj.lng = e.poi.location.lng
+            //         that.$emit('searchAddress', obj)
+            //       } else {
+            //         that.$emit('searchAddress', '')
+            //       }
+            //       that.map.setFitView()
+            //     })
+            //   } else {
+            //     districtSearch.search(e.poi.name, (status, result1) => {
+            //       if (status == 'complete') {
+            //         that.marker.setPosition(result1.districtList[0].center)
+            //         geocoder.getAddress(result1.districtList[0].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 = result1.districtList[0].center.lat
+            //             obj.lng = result1.districtList[0].center.lng
+            //             that.$emit('searchAddress', obj)
+            //           } else {
+            //             that.$emit('searchAddress', '')
+            //           }
+            //           that.map.setFitView()
+            //         })
 
 
-                  }
-                })
-              }
-            })
+            //       }
+            //     })
+            //   }
+            // })
             // 经纬度
             var geocoder = new AMap.Geocoder({
               radius: 1000,
             })
-            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(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('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) {
+            // 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
@@ -352,14 +213,69 @@
             //       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) {debugger
+              // 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') {
+                  that.clickData = result
+                  console.log(e.lnglat)
+                  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)

+ 1 - 0
src/views/houseSelfCollect/paymentManagement.vue

@@ -975,6 +975,7 @@ import download from '../../components/WsDownload/download'
         sessionStorage.setItem('cwprint', true)
       },
       print(row) {
+        this.printType = 2
         sessionStorage.setItem('cwprint', false)
         getpaymentexamine({
             id: row.id

+ 214 - 21
src/views/tradeServicesManagement/warehouseReceiptRegulation.vue

@@ -1,27 +1,220 @@
 //贸易服务管理
 <template>
-	<div>
-		 <map-drag></map-drag>
-	</div>
+  <div class="container">
+    <map-drag :class="{active:isActive}"></map-drag>
+    <div class="bottom" :class="{active:isActive}">
+      <div class="bottom-content">
+        <div class="bottom-item" @click="startHacking">查看申请记录</div>
+        <div class="bottom-item">》》</div>
+        <el-checkbox v-model="checked" class="bottom-item">默认地图</el-checkbox>
+      </div>
+    </div>
+    <div class="top">
+      <div class="top-content">
+        <div class="top-item" @click="startHacking1">查看地图</div>
+        <div class="top-item">》》</div>
+        <el-checkbox v-model="checked" class="top-item">默认列表</el-checkbox>
+      </div>
+    </div>
+    <!-- <el-table :data="tableData" class="content2">
+      <el-table-column prop="date" label="日期" width="140"></el-table-column>
+      <el-table-column prop="name" label="姓名" width="120"></el-table-column>
+      <el-table-column prop="address" label="地址"></el-table-column>
+    </el-table>-->
+    <div class="content2">
+      <div class="header">
+        <el-button type="primary">全部</el-button>
+        <el-button type="primary">待审核</el-button>
+        <el-button type="primary">待审批</el-button>
+        <el-button type="primary">待还</el-button>
+        <el-button type="primary">已还</el-button>
+        <el-input placeholder="可按业务编号、合同编号、仓库名查找" class="search-input"></el-input>
+        <el-button type="primary">查找</el-button>
+        <el-button type="primary" class="add" @click="add">添加</el-button>
+      </div>
+      <el-table
+        :data="customertList"
+        style="width: 100%; margin-top: 20px"
+        ref="customertList"
+        border
+        height="600"
+      >
+        <el-table-column type="index" label="序号">
+          <template scope="scope">
+            <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+            <span v-else>{{ scope.$index + 1 }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="customerName" label="业务编号"></el-table-column>
+        <el-table-column prop="customerPhone" label="合同编号"></el-table-column>
+        <el-table-column prop="bankCard" label="仓库名"></el-table-column>
+        <el-table-column prop="bankDeposit" label="仓位号">
+          <!-- <template slot-scope="scope">
+            <div>{{scope.row.bankDeposit}}-{{scope.row.bankDepositBranch}}</div>
+          </template> -->
+        </el-table-column>
+        <el-table-column prop="payeeName" label="货名"></el-table-column>
+        <el-table-column prop="authenticationStatus" label="重量(吨)"></el-table-column>
+		<el-table-column prop="authenticationStatus" label="单价(元/吨)"></el-table-column>
+		<el-table-column prop="authenticationStatus" label="总价值(元)"></el-table-column>
+		<el-table-column prop="authenticationStatus" label="发放金额(元)"></el-table-column>
+		<el-table-column prop="authenticationStatus" label="应还金额(元)"></el-table-column>
+		<el-table-column prop="authenticationStatus" label="已还金额(元)"></el-table-column>
+		<el-table-column prop="authenticationStatus" label="待还金额(元)"></el-table-column>
+		 <el-table-column prop="bankDeposit" label="状态">
+          <!-- <template slot-scope="scope">
+            <div>{{scope.row.bankDeposit}}-{{scope.row.bankDepositBranch}}</div>
+          </template> -->
+        </el-table-column>
+        <el-table-column prop="address" label="操作">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              @click="createCustomer(scope.row, 2)"
+              v-show="scope.row.authenticationStatus!='已删除'"
+            >查看</el-button>
+			 <el-button
+              size="mini"
+              @click="createCustomer(scope.row, 2)"
+              v-show="scope.row.authenticationStatus!='已删除'"
+            >审核</el-button>
+			 <el-button
+              size="mini"
+              @click="createCustomer(scope.row, 2)"
+              v-show="scope.row.authenticationStatus!='已删除'"
+            >审批</el-button>
+			 <el-button
+              size="mini"
+              @click="createCustomer(scope.row, 2)"
+              v-show="scope.row.authenticationStatus!='已删除'"
+            >还款</el-button>
+            <el-button
+              size="mini"
+              @click="createCustomer(scope.row, 3)"
+              v-show="scope.row.authenticationStatus!='已删除'"
+              :disabled="!scope.row.isEdit"
+            >修改</el-button>
+            <el-button size="mini" type="danger" @click="handleDelete(scope.row, '')">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+	   <div class="paging">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-size="deptCircularPage.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="deptBudgetTotal"
+        ></el-pagination>
+      </div>
+    </div>
+  </div>
 </template>
 <script>
-  import mapDrag from '@/components/mapdrag/warehouseReceiptMap'
-	import {getList} from '@/model/tradeServicesManagement/index'
-	export default {
-		 components: {mapDrag},
-		data() {
-			return {
-				
-			}
-		},
-		activated() {
-			
-		},
-		methods: {
-		
-		},
-	}
+import mapDrag from '@/components/mapdrag/warehouseReceiptMap'
+import { getList } from '@/model/tradeServicesManagement/index'
+export default {
+  components: { mapDrag },
+  data() {
+    const item = {
+      date: '2016-05-02',
+      name: '王小虎',
+      address: '上海市普陀区金沙江路 1518 弄'
+    }
+    return {
+      tableData: Array(20).fill(item),
+      isActive: false,
+      checked: true,
+	  customertList: [],
+	  currentPage: 1,
+      pageSize: 10,
+      deptBudgetTotal: 0,
+      deptCircularPage: {},
+    }
+  },
+  activated() {},
+  beforeCreate() {
+    document.querySelector('body').setAttribute('style', 'overflow:hidden;')
+  },
+  mounted() {
+    let height = document.body.offsetHeight - 57
+    document
+      .querySelector('.container')
+      .setAttribute('style', 'height:' + height + 'px;')
+    console.log('高度', height)
+  },
+  methods: {
+	     handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+    startHacking() {
+      this.isActive = true
+    },
+    startHacking1() {
+      this.isActive = false
+    },
+    add() {}
+  }
+}
 </script>
-<style lang="scss" scoped>
-
+<style lang="scss">
+.container {
+}
+.active {
+  height: 0 !important;
+  overflow: hidden;
+}
+.bottom {
+  display: flex;
+  justify-items: flex-end;
+  height: 5%;
+  align-content: center;
+  .bottom-content {
+    display: flex;
+    justify-content: flex-end;
+    width: 100%;
+  }
+  .bottom-item {
+    display: flex;
+    align-items: center;
+  }
+}
+.top {
+  display: flex;
+  justify-items: flex-end;
+  height: 5%;
+  align-content: center;
+  .top-content {
+    display: flex;
+    justify-content: flex-end;
+    width: 100%;
+  }
+  .top-item {
+    display: flex;
+    align-items: center;
+  }
+}
+.content2 {
+  background: pink;
+  padding: 20px;
+  .header{
+	  position: relative;
+	  .add{
+		  position: absolute;
+		  right: 0;
+	  }
+  }
+  .search-input {
+	width: 300px;
+	margin-left: 10px;
+  }
+}
 </style>

+ 5 - 1
src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -80,6 +80,7 @@
           </el-row>
           <div class="small-title" style="font-size: 16px">联络员及航次</div>
           <el-row class="myTest">
+
             <!--当前运输总价-->
             <el-form-item label="当前运输总价(元/吨):" prop="tranPrice" label-width="150px" class="input-item-margin">
               <el-input v-model="deptBudgetList.tranPrice" maxlength="70" disabled />
@@ -770,8 +771,11 @@
     // background: green;
     padding-left: 20px;
     align-items: center;
+    width: 800px;
   }
-
+.myTest .el-form-item {
+  width: 33.333%;
+}
   .content3 {
     width: calc(100% + 20px);
 

+ 4 - 3
src/views/tranManagement/tranManagementShippingFeedback.vue

@@ -187,7 +187,7 @@
               </span>
             </div>
             <div class="catNos" v-if="item.shipType == '散船'">
-              仓位-{{ index + 1 }}
+              仓位-{{ index + 1 }}
               <span class="noservice" v-show="item.status == '未装车'"
                 >未装船</span
               >
@@ -200,7 +200,7 @@
             </div>
             <!--箱号-->
             <el-form-item
-              label="箱号"
+              label="箱号:"
               prop="caseNo"
               v-if="item.shipType == '集装箱'"
             >
@@ -218,7 +218,7 @@
             </el-form-item>
             <!--封号-->
             <el-form-item
-              label="封号"
+              label="封号:"
               prop="titleNo"
               v-if="item.shipType == '集装箱'"
             >
@@ -237,6 +237,7 @@
             <!-- 仓位号 -->
             <ws-form-item
               span="1"
+              label="仓位号:"
               prop="binNumber"
               v-if="item.shipType == '散船'"
               >{{ item.binNumber }}</ws-form-item

+ 2 - 2
src/views/tranManagement/tranManagementShippingFeedbackLook.vue

@@ -83,7 +83,7 @@
               </span>
             </div>
             <div class="catNos" v-if="item.shipType == '散船'">
-              仓位-{{ index + 1 }}
+              仓位-{{ index + 1 }}
               <span class="noservice" v-show="item.status == '未装车'">未装船</span>
               <span class="service" v-show="item.status == '已装车'">已装船</span>
               <span class="serviced" v-show="item.status == '已送达'">
@@ -101,7 +101,7 @@
               <span>{{ item.titleNo }}</span>
             </ws-form-item>
             <!-- 仓位号 -->
-            <ws-form-item span="1" prop="binNumber" v-if="item.shipType == '散船'">{{ item.binNumber }}</ws-form-item>
+            <ws-form-item span="1" label="仓位号:" prop="binNumber" v-if="item.shipType == '散船'">{{ item.binNumber }}</ws-form-item>
             <!-- 计划重量 -->
             <ws-form-item label="计划重量(吨)" span="1" prop="positionWeight" v-if="item.shipType == '散船'">
               {{ item.positionWeight }}</ws-form-item>

+ 5 - 5
src/views/tranManagement/tranManagementShippingLook.vue

@@ -392,13 +392,13 @@
     }
 
     .el-input__inner {
-      background-color: #fff;
-      border-color: #fff !important;
-      color: #000 !important;
+      // background-color: #fff;
+      // border-color: #fff !important;
+      color: #c0c4cc !important;
       font-size: 14px;
       cursor: text;
-      padding: 0 !important;
-      border: none;
+      padding: 0 10px !important;
+      // border: none;
     }
   }
 

+ 4 - 5
src/views/tranManagement/tranManagementTransporTrainDetails.vue

@@ -95,7 +95,7 @@
               <ws-input
                 v-model="deptBudgetList.tranPrice"
                 maxlength="70"
-                :disabled="readonly"
+                disabled
                 size="small"
                 style="width:70px"
               />
@@ -553,12 +553,11 @@ export default {
     display: none;
   }
   .el-input__inner {
-    background-color: #fff;
-    border-color: #fff !important;
-    color: #000 !important;
+    color: #c0c4cc !important;
     font-size: 14px;
     cursor: text;
-    padding: 0 !important;
+    padding: 0 10px !important;
+
   }
 }
 .winseaview-view {

+ 14 - 9
src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -103,24 +103,25 @@
                   style="width:70px"
                 />
             </ws-form-item>
-            <ws-form-item>
-
+            <!-- <ws-form-item>
+            </ws-form-item> -->
              <el-button
               v-if="deptBudgetList.priceStatus=='审核中'"
               type="primary"
               v-hasPermission="`tranManager.transportationInfo.trian`" 
               size="small"
               @click="examine()"
+              class="submit"
               >审核中</el-button
             >
              <el-button
              v-else
               type="primary"
               size="small"
+              class="submit"
               @click="priceSubmit()"
               >提交</el-button
             >
-            </ws-form-item>
           </div>
       <div
         class="liaison"
@@ -752,7 +753,7 @@ export default {
   margin: 0 auto;
 }
 .el-form-item {
-  width: 50%;
+  width: 33.333%;
 }
 .el-form-item__label {
   text-align: center;
@@ -811,10 +812,10 @@ export default {
     display: none;
   }
   .el-input__inner {
-    color: #000 !important;
+     color: #c0c4cc !important;
     font-size: 14px;
     cursor: text;
-    padding: 0 !important;
+    padding: 0 10px !important;
   }
 }
 //减号
@@ -940,10 +941,14 @@ export default {
   padding: 0px;
 }
  .myTest{
-    width: 800px;
     display: flex;
-    height: 40px;
     margin: 20px 0;
+    // background: green;
+    padding-left: 20px;
+    align-items: center;
+    width: 800px;
   }
-
+.myTest .submit{
+ margin-top: -16px;
+}
 </style>

+ 2 - 1
src/views/tranManagement/tranManagementUnShippingFeedback.vue

@@ -186,7 +186,7 @@
               </span>
             </div>
             <div class="catNos" v-if="item.shipType == '散船'">
-              仓位-{{ index + 1 }}
+              仓位-{{ index + 1 }}
               <span class="noservice" v-show="item.status == '未装车'">
                 未装船
               </span>
@@ -216,6 +216,7 @@
             <!-- 仓位号 -->
             <ws-form-item
               span="1"
+              label="仓位号:"
               prop="binNumber"
               v-if="item.shipType == '散船'"
             >

+ 2 - 2
src/views/tranManagement/tranManagementUnShippingFeedbackLook.vue

@@ -146,7 +146,7 @@
                 </span>
             </div>
             <div class="catNos" v-if="item.shipType == '散船'">
-              仓位-{{ index + 1 }}
+              仓位-{{ index + 1 }}
               <span class="noservice" v-show="item.status == '未装车'">
                   未装船
                 </span>
@@ -166,7 +166,7 @@
              <span>{{ item.titleNo }}</span>
             </ws-form-item>
             <!--仓位号-->
-            <ws-form-item  span="1" prop="binNumber" v-if="item.shipType == '散船'">
+            <ws-form-item label="仓位号:" span="1" prop="binNumber" v-if="item.shipType == '散船'">
              <span>{{ item.binNumber }}</span>
             </ws-form-item>
             <!--装船净重-->

+ 1 - 1
src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -336,7 +336,7 @@
                   maxlength="120"
                   size="small"
                 />
-              </ws-form-item>
+              </ws-form-item> 
             </ws-info-table>
             <span
               v-if="item.status == '未装车'||item.temporaryDriverFlag!=0"