前端

src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -25,8 +25,17 @@
         </ws-form-item>
 
         <!--运输方式-->
-        <ws-form-item label="运输方式" span="1" prop="shippingType">
+        <!-- <ws-form-item label="运输方式" span="1" prop="shippingType">
           <ws-input v-model="deptBudgetList.shippingType" placeholder="请输入运输方式" maxlength="100" size="small" />
+        </ws-form-item> -->
+        <ws-form-item label="运输方式" span="1" prop="shippingType">
+          <ws-select v-model="deptBudgetList.shippingType" placeholder="请选择运输方式" >
+            <ws-option label="汽运" value="汽运"></ws-option>
+            <ws-option label="火运" value="火运"></ws-option>
+            <ws-option label="散船" value="散船"></ws-option>
+            <ws-option label="集装箱船" value="集装箱船"></ws-option>
+          </ws-select>
+          <!-- <ws-input v-model="deptBudgetList.shippingType" placeholder="请输入运输方式" maxlength="100" size="small" /> -->
         </ws-form-item>
         <!--买方-->
         <ws-form-item label="买方" span="1" prop="buyer">
@@ -442,6 +451,7 @@
           contractGoodsInfo: {
             goodsName: '',
           },
+          shippingType:'汽运',
           contractProcessInfo: {},
           sourceGoods: '',
           placeDelivery: '',

src/views/contractManagement/futuresSalesContractAdd.vue

@@ -25,8 +25,17 @@
         </ws-form-item>
 
         <!--运输方式-->
-        <ws-form-item label="运输方式" span="1" prop="shippingType">
+        <!-- <ws-form-item label="运输方式" span="1" prop="shippingType">
           <ws-input v-model="deptBudgetList.shippingType" placeholder="请输入运输方式" maxlength="100" size="small" />
+        </ws-form-item> -->
+        <ws-form-item label="运输方式" span="1" prop="shippingType">
+          <ws-select v-model="deptBudgetList.shippingType" placeholder="请选择运输方式" >
+            <ws-option label="汽运" value="汽运"></ws-option>
+            <ws-option label="火运" value="火运"></ws-option>
+            <ws-option label="散船" value="散船"></ws-option>
+            <ws-option label="集装箱船" value="集装箱船"></ws-option>
+          </ws-select>
+          <!-- <ws-input v-model="deptBudgetList.shippingType" placeholder="请输入运输方式" maxlength="100" size="small" /> -->
         </ws-form-item>
         <!--买方-->
         <ws-form-item label="买方" span="1" prop="buyer">
@@ -427,6 +436,7 @@
           contractGoodsInfo: {
             goodsName: '',
           },
+          shippingType:'汽运',
           contractProcessInfo: {},
           sourceGoods: '',
           placeDelivery: '',

src/views/contractManagement/purchaseContractAdd.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="container">
     <el-row>
-      <el-col :span="12"  class="bg">
+      <el-col :span="12"  class="bg" >
         <h2 class="bg-left title">创建采购合同</h2>
       </el-col>
       <el-col :span="12" class="bg-right bg">
@@ -76,7 +76,13 @@
         </ws-form-item>
         <!--运输方式-->
         <ws-form-item label="运输方式" span="1" prop="shippingType">
-          <ws-input v-model="deptBudgetList.shippingType" placeholder="请输入运输方式" maxlength="100" size="small" />
+          <ws-select v-model="deptBudgetList.shippingType" placeholder="请选择运输方式" >
+            <ws-option label="汽运" value="汽运"></ws-option>
+            <ws-option label="火运" value="火运"></ws-option>
+            <ws-option label="散船" value="散船"></ws-option>
+            <ws-option label="集装箱船" value="集装箱船"></ws-option>
+          </ws-select>
+          <!-- <ws-input v-model="deptBudgetList.shippingType" placeholder="请输入运输方式" maxlength="100" size="small" /> -->
         </ws-form-item>
 
        
@@ -295,9 +301,9 @@
           <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
             value-format="yyyy-MM-dd" />
         </ws-form-item>
-        <ws-form-item label="最终实际成交量（吨）" span="1" prop="finalTradingVolume">
+        <!-- <ws-form-item label="最终实际成交量（吨）" span="1" prop="finalTradingVolume">
           <ws-input v-model="deptBudgetList.finalTradingVolume" placeholder="请输入最终实际成交量" maxlength="100" size="small" />
-        </ws-form-item>
+        </ws-form-item> -->
         <ws-form-item label="结算重量方式" span="1" prop="settlementWeightMethod" class="readonly"
           v-if="deptBudgetList.deliverType==1">
           <el-radio v-model="deptBudgetList.settlementWeightMethod" label="1">按出库重量结算</el-radio>
@@ -551,6 +557,7 @@ import { isUndefined } from 'xe-utils/methods'
           sellerPhone:'',
           personPhone:'',
           personCharge:'',
+          shippingType:'汽运',
           personChargeKey:'',
           finalTradingVolume: 0,
           totalContractPrice: 0,

src/views/contractManagement/purchaseContractExamine.vue

@@ -202,7 +202,7 @@
       <div class="remark">
         <h3>备注信息</h3>
       </div>
-    <div style=" color: #afb5cb;margin-left: 20px;margin-bottom: 20px;">
+    <div style=" color: #afb5cb;margin-bottom: 20px;">
         <!-- {{ deptBudgetList.remarks }} -->
         <ws-input v-model="deptBudgetList.remarks" disabled type="textarea" autosize row="3" placeholder="暂无备注信息"
         maxlength="3000" />

src/views/contractManagement/salesContractAdd.vue

@@ -88,9 +88,18 @@
               </el-select>
           </ws-form-item>
           <!--运输方式-->
-          <ws-form-item label="运输方式" span="1" prop="shippingType">
+          <!-- <ws-form-item label="运输方式" span="1" prop="shippingType">
             <ws-input v-model="deptBudgetList.shippingType" placeholder="请输入运输方式" maxlength="20" size="small" />
-          </ws-form-item>
+          </ws-form-item> -->
+          <ws-form-item label="运输方式" span="1" prop="shippingType">
+          <ws-select v-model="deptBudgetList.shippingType" placeholder="请选择运输方式" >
+            <ws-option label="汽运" value="汽运"></ws-option>
+            <ws-option label="火运" value="火运"></ws-option>
+            <ws-option label="散船" value="散船"></ws-option>
+            <ws-option label="集装箱船" value="集装箱船"></ws-option>
+          </ws-select>
+          <!-- <ws-input v-model="deptBudgetList.shippingType" placeholder="请输入运输方式" maxlength="100" size="small" /> -->
+        </ws-form-item>
           <!--卖方-->
           <ws-form-item label="卖方" span="1" prop="seller" class="readonly">
             <!-- <ws-input v-model="deptBudgetList.seller" placeholder="请输入卖方名称" maxlength="100" size="small" /> -->
@@ -510,6 +519,7 @@
           contractGoodsInfo: {
             goodsName: '',
           },
+          shippingType:'汽运',
           buyerPhone:'',
           transactionSubject:'自营',
           contractProcessInfo: {},

src/views/contractManagement/storageContractAdd.vue

@@ -30,10 +30,18 @@
             <ws-input v-model="deptBudgetList.pointOut" placeholder="请输入合同提示" maxlength="10" size="small" />
           </ws-form-item>
           <!--运输方式-->
-        <ws-form-item label="运输方式" span="1" prop="shippingType">
+        <!-- <ws-form-item label="运输方式" span="1" prop="shippingType">
           <ws-input v-model="deptBudgetList.shippingType" placeholder="请输入运输方式" maxlength="100" size="small" />
+        </ws-form-item> -->
+        <ws-form-item label="运输方式" span="1" prop="shippingType">
+          <ws-select v-model="deptBudgetList.shippingType" placeholder="请选择运输方式" >
+            <ws-option label="汽运" value="汽运"></ws-option>
+            <ws-option label="火运" value="火运"></ws-option>
+            <ws-option label="散船" value="散船"></ws-option>
+            <ws-option label="集装箱船" value="集装箱船"></ws-option>
+          </ws-select>
+          <!-- <ws-input v-model="deptBudgetList.shippingType" placeholder="请输入运输方式" maxlength="100" size="small" /> -->
         </ws-form-item>
-         
           <!--买方-->
           <ws-form-item label="买方" span="1" prop="buyer" class="readonly">
             <el-select v-model="deptBudgetList.buyer" placeholder="请选择买方名称" class="typeselect" filterable clearable
@@ -424,6 +432,7 @@
             goodsName: '',
           },
           buyerPhone: '',
+          shippingType:'汽运',
           contractProcessInfo: {},
           addressUrl: '',
           // sourceGoods: '',

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -586,6 +586,9 @@ export default {
         }, {
           value: '吉林中翰兴粮食贸易有限公司',
           label: '吉林中翰兴粮食贸易有限公司'
+        }, {
+          value: '黑龙江中天绿粮供应链服务有限公司',
+          label: '黑龙江中天绿粮供应链服务有限公司'
         }],
       companyNameOptions: [{
         value: '黑龙江中天昊元贸易有限公司',
@@ -621,6 +624,9 @@ export default {
       }, {
           value: '吉林中翰兴粮食贸易有限公司',
           label: '吉林中翰兴粮食贸易有限公司'
+        }, {
+          value: '黑龙江中天绿粮供应链服务有限公司',
+          label: '黑龙江中天绿粮供应链服务有限公司'
         }],
       companyNameEWOptions: [{
         value: '天津建源供应链管理有限公司',
@@ -700,6 +706,12 @@ export default {
         }, {
           value: '吉林中翰兴粮食贸易有限公司',
           label: '吉林中翰兴粮食贸易有限公司'
+        }, {
+          value: '吉林中翰兴粮食贸易有限公司',
+          label: '吉林中翰兴粮食贸易有限公司'
+        }, {
+          value: '黑龙江中天绿粮供应链服务有限公司',
+          label: '黑龙江中天绿粮供应链服务有限公司'
         }]
         
           this.ewCustomerOptions= [
@@ -736,6 +748,9 @@ export default {
         }, {
           value: '吉林中翰兴粮食贸易有限公司',
           label: '吉林中翰兴粮食贸易有限公司'
+        }, {
+          value: '黑龙江中天绿粮供应链服务有限公司',
+          label: '黑龙江中天绿粮供应链服务有限公司'
         }]
           this.companyNameEWOptions=[
           {
@@ -771,6 +786,9 @@ export default {
         }, {
           value: '吉林中翰兴粮食贸易有限公司',
           label: '吉林中翰兴粮食贸易有限公司'
+        }, {
+          value: '黑龙江中天绿粮供应链服务有限公司',
+          label: '黑龙江中天绿粮供应链服务有限公司'
         }]
            if(localStorage.getItem('print_company_name')){
             this.companyName=localStorage.getItem('print_company_name')

src/views/houseSelfCollect/weightCheckRecord.vue

@@ -399,6 +399,9 @@
         }, {
           value: '吉林中翰兴粮食贸易有限公司',
           label: '吉林中翰兴粮食贸易有限公司'
+        }, {
+          value: '黑龙江中天绿粮供应链服务有限公司',
+          label: '黑龙江中天绿粮供应链服务有限公司'
         }],
         companyNameOptions: [{
           value: '黑龙江中天昊元贸易有限公司',
@@ -430,6 +433,9 @@
         }, {
           value: '吉林中翰兴粮食贸易有限公司',
           label: '吉林中翰兴粮食贸易有限公司'
+        }, {
+          value: '黑龙江中天绿粮供应链服务有限公司',
+          label: '黑龙江中天绿粮供应链服务有限公司'
         }],
         companyNameEWOptions: [{
           value: '天津建源供应链管理有限公司',
@@ -525,6 +531,9 @@
         }, {
           value: '吉林中翰兴粮食贸易有限公司',
           label: '吉林中翰兴粮食贸易有限公司'
+        }, {
+          value: '黑龙江中天绿粮供应链服务有限公司',
+          label: '黑龙江中天绿粮供应链服务有限公司'
         }]
           this.ewCustomerOptions= [
           {
@@ -560,6 +569,9 @@
         }, {
           value: '吉林中翰兴粮食贸易有限公司',
           label: '吉林中翰兴粮食贸易有限公司'
+        }, {
+          value: '黑龙江中天绿粮供应链服务有限公司',
+          label: '黑龙江中天绿粮供应链服务有限公司'
         }]
           this.companyNameEWOptions=[
           {
@@ -592,6 +604,9 @@
         }, {
           value: '黑龙江启兴粮食贸易有限公司',
           label: '黑龙江启兴粮食贸易有限公司'
+        }, {
+          value: '黑龙江中天绿粮供应链服务有限公司',
+          label: '黑龙江中天绿粮供应链服务有限公司'
         }]
            if(localStorage.getItem('print_company_name')){
             this.companyName=localStorage.getItem('print_company_name')

src/views/profitable/expensemanagementdetails.vue

@@ -162,7 +162,7 @@
               </div> -->
             </template>
           </el-table-column>
-          <el-table-column prop="expenseName" label="费用名称"></el-table-column>
+          <el-table-column width="180" prop="expenseName" label="费用名称"></el-table-column>
           <el-table-column prop="amountMoney" width="120" label="费用金额（元）"></el-table-column>
           <el-table-column prop="unallocatedAmount" width="100" label="未分配（元）"></el-table-column>
           <el-table-column prop="expenseRemarks" label="附件">

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -2111,9 +2111,9 @@ export default {
 }
 .center {
   position: relative;
-  top: 50px;
+  top: -17px;
   width: 40%;
-  height: 2000px;
+  height: 50px;
   margin: 0 auto;
   margin-right: 180px;
 }

src/views/warehousenew/warehousingOrder.vue

@@ -59,7 +59,7 @@
         `warehouseManagement.warehousingOrder.View`">待审核
         </ws-button>
         <el-checkbox @change="chaeckedchange" v-model="checked"></el-checkbox>
-        <span v-if="checked">合计剩余：{{tabletotal}}吨</span>
+        <span>合计剩余：  <span v-if="checked">{{tabletotal}}吨</span></span>
       </el-col>
       <el-col style='text-align:right;' :span="12">
         <!-- <ws-button v-hasPermission="
@@ -1311,6 +1311,7 @@ export default {
           if(this.warehouseList[i].warehouseName == e){
             console.log(this.warehouseList[i])
             if(this.warehouseList[i].goodsNameInfos){
+              this.goodsList=[]
               for(let j = 0;j<this.warehouseList[i].goodsNameInfos.length;j++){//构造数据，合并重复货名
               if(j==0){
                 this.goodsList.push(this.warehouseList[i].goodsNameInfos[j])
@@ -1328,6 +1329,8 @@ export default {
                 // 
               }
             }
+            }else{
+              this.goodsList=[]
             }
             
             this.baseId = this.warehouseList[i].id