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

src/components/balanceAlert.vue

@@ -58,7 +58,9 @@ export default {
           const port = await navigator.serial.requestPort()
           if (this.deptBudgetList.warehouseName == '白城内陆港'||this.deptBudgetList.warehouseName == '肇东金信库') {
             this.param = 1200
-          } else {
+          } else if(this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库') {
+            this.param = 2400
+          }else {
             this.param = 9600
           }
           console.log(this.param)

src/views/contractManagement/purchaseContract.vue

@@ -73,7 +73,7 @@
       </el-table-column>
       <el-table-column width='150' prop="status" label="状态">
         <template slot-scope="scope">
-          <div v-if="scope.row.status != '执行中'&&scope.row.status != '发运结束'">
+          <div v-if="scope.row.status != '执行中'&&scope.row.status != '发运结束'&&scope.row.status !='已驳回'">
             <!-- <span v-if="scope.row.approveStatus">{{
               scope.row.approveStatus
             }}</span> -->
@@ -122,6 +122,9 @@
               style="vertical-align: text-top; position: relative; top: -1px;" src="../../../public/img/edit.png"
               @click="editClick(scope.row)" alt="" /> -->
           </div>
+          <div v-else-if="scope.row.status == '已驳回'">
+            已驳回
+          </div>
           <div v-else>
             <!-- {{scope.row.status}} -->
             <el-select v-model="scope.row.status" placeholder="" class="statusselect"
@@ -238,8 +241,8 @@
         tableDate: [],
         size: 10,
         statusList:[{
-          value:'已完成',
-        },{value:'发运结束',}],
+          value:'发运结束',
+        },{value:'已完成',}],
         // 是否显示
         showType: true,
         // 年

src/views/contractManagement/salesContract.vue

@@ -75,7 +75,7 @@
       </el-table-column>
       <el-table-column width='150' prop="status" label="状态">
         <template slot-scope="scope">
-          <div v-if="scope.row.status != '执行中'&&scope.row.status != '发运结束'">
+          <div v-if="scope.row.status != '执行中'&&scope.row.status != '发运结束'&&scope.row.status != '已驳回'">
             <!-- <span v-if="scope.row.approveStatus">{{
               scope.row.approveStatus
             }}</span> -->
@@ -90,8 +90,6 @@
             @change='selectstatuschange($event,scope.row)'
 
             :value="scope.row.status">
-            <el-option label="待执行" value="待执行"
-              style="color: #8890b1" />
               <el-option label="执行中" value="执行中"
               style="color: #8890b1" />
           </el-select>
@@ -124,6 +122,9 @@
               style="vertical-align: text-top; position: relative; top: -1px;" src="../../../public/img/edit.png"
               @click="editClick(scope.row)" alt="" /> -->
           </div>
+          <div v-else-if="scope.row.status == '已驳回'">
+            已驳回
+          </div>
           <div v-else>
             <!-- {{scope.row.status}} -->
             <el-select v-model="scope.row.status" placeholder="" class="statusselect"
@@ -280,8 +281,8 @@
           },
         },
         statusList:[{
-          value:'已完成',
-        },{value:'发运结束',}],
+          value:'发运结束',
+        },{value:'已完成',}],
         accessoryTFs: false,
         accesscard: false,
         accessurl: '',

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -191,7 +191,8 @@
               </ws-form-item>
               <ws-form-item label="车牌号" span="1" prop="carNo" v-if="
               dataList.outType == '汽运' ||
-              dataList.outType == '集装箱船'
+              dataList.outType == '集装箱船' ||
+              dataList.outType == '散船'
             ">
                 <ws-input v-if="!carstatus || carjudge" v-model="dataList.carNo" placeholder="请输入车牌号" maxlength="7"
                   size="small" />

src/views/warehouse/warehouseManagementTare.vue

@@ -182,7 +182,7 @@
               </ws-form-item>
 
               <ws-form-item label="车牌号" span="1" prop="carNo"
-                v-if="deptBudgetList.outType == '汽运' || deptBudgetList.outType == '集装箱船'">
+                v-if="deptBudgetList.outType == '汽运' || deptBudgetList.outType == '集装箱船' || deptBudgetList.outType == '散船'">
                 <ws-input v-if="!carstatus || carjudge" v-model="deptBudgetList.carNo" placeholder="请输入车牌号"
                   maxlength="7" size="small" />
                 <el-select v-else filterable clearable :filter-method="dataFilter2" v-model="deptBudgetList.carNo"