Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -32,7 +32,7 @@
             </el-form-item>
           </div>
           <div class="grid-content">
-            <el-form-item label="干粮收购价格（元/公斤）">
+            <el-form-item label="干粮收购价格（元/公斤）"  label-width="180px">
               <el-input v-model="baseInfoForm.dryGrainPrice" :disabled="!isEdit"></el-input>
             </el-form-item>
           </div>
@@ -284,6 +284,7 @@
         case "新增":
           this.submitName = "提交"
           this.isCountShow = true
+          this.checkList=[]
           this.baseInfoForm = {
             warehouseId: '',
             warehouseName: '',

src/views/houseSelfCollect/customerManagementAdd.vue

@@ -157,7 +157,7 @@
         identityLow: 'low',
         bankUps: 'bankUp',
         bankLows: 'bankLow',
-        sendText: '',
+        sendText: '60S后重发',
         sendDisabled: false,
         verifyCode: "",
         bankList:[],

src/views/houseSelfCollect/inspectInfo.vue

@@ -28,10 +28,10 @@
               </ws-select>
             </ws-form-item>
             <ws-form-item label="客户" span="1" prop="customerName">
-              <ws-select v-model="inspect.customerName" placeholder="" class="typeselect" @change="customerChange"
+              <el-select v-model="inspect.customerName" clearable filterable  placeholder="请选择" class="typeselect" @change="customerChange"
                 :disabled="disabled1">
-                <ws-option v-for="item in customerList" :key="item.valueKey" :label="item.value" :value="item.value" />
-              </ws-select>
+                <el-option v-for="item in customerList" :key="item.valueKey" :label="item.value" :value="item.value" />
+              </el-select>
             </ws-form-item>
             <ws-form-item label="囤位号" span="1" prop="storageTagNo">
               <ws-input v-model="inspect.storageTagNo" placeholder="请输入囤位号" maxlength="15" size="small"
@@ -90,7 +90,7 @@
               <ws-input v-model="inspect.mildewGrain" placeholder="请输入霉变粒占比" maxlength="100" size="small"
                 :disabled="disabled" />
             </ws-form-item>
-            <ws-form-item label="容重(克/升)>=" span="1" prop="bulkDensity">
+            <ws-form-item label="容重(克/升)" span="1" prop="bulkDensity">
               <ws-input v-model="inspect.bulkDensity" placeholder="请输入容重" maxlength="100" size="small"
                 :disabled="disabled" />
             </ws-form-item>

src/views/houseSelfCollect/weightCheck.vue

@@ -11,14 +11,14 @@
       </el-col>
     </el-row>
     <div class="substance">
-
       <div class="left">
         <div class="top">
-          <div v-if="index==0" class="weight">{{weighingList.grossWeight}} <span>kg</span></div>
-          <div v-else class="weight">{{weighingList.tare}} <span>kg</span></div>
-          <div class="car-no">{{carWeightInfo.carNumber}}</div>
           <div class="car-type">{{carWeightInfo.type}}</div>
+          <div v-if="index==0" class="weight">{{weighingList.grossWeight}} <span class="kg-style">kg</span></div>
+          <div v-else class="weight">{{weighingList.tare}} <span class="kg-style">kg</span></div>
+          <div class="car-no">{{carWeightInfo.carNumber}}</div>
         </div>
+        <h2 class="bg-left titleup">实时监控</h2>
         <div class="bottom">
           <div class="video1">
             <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" v-if="!video1Src">
@@ -707,18 +707,30 @@
 
     .left {
       width: 30%;
-      padding: 20px;
+      // padding:0 20px 20px 20px;
 
       .top {
         background: black;
-        color: #147505;
+        color: #2AFF7C;
         font-size: 32px;
         text-align: right;
         padding: 20px;
+        border-radius: 10px;
+        margin: 0 20px 20px 20px;
+        .car-type{
+          text-align: left;
+        }
+        .kg-style{
+          font-size: 30px;
+        }
       }
 
       .bottom {
         text-align: center;
+        background: white;
+        margin: 20px 20px 0 20px;
+        border-radius: 10px;
+        padding-bottom: 20px;
 
         .img1,
         .img2 {
@@ -737,6 +749,7 @@
       padding: 20px;
       background: white;
       margin-right: 20px;
+      border-radius: 10px;
 
       .tab {
         display: flex;

src/views/outboundManagement/weighing.vue

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

src/views/taskManagement/tranManagementLook.vue

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

src/views/taskManagement/tranManagementTransporTationFire.vue

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

src/views/taskManagement/tranManagementTransportEdit.vue

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

src/views/tranManagement/tranManagementReceivingFeedback.vue

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

src/views/tranManagement/tranManagementShipping.vue

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

src/views/tranManagement/tranManagementTransporHairRespond.vue

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

src/views/tranManagement/tranManagementTransporTationFire.vue

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

src/views/tranManagement/tranManagementVehicle.vue

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