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

src/api/V2/platformaudit/index.js

@@ -36,4 +36,6 @@ export const API_POST_EDIT_SETTLEDCOMPANY = '/settledCompanyInfo/api/editSettled
 export const API_POST_SETTLED_EXAMINE = '/settledCompanyInfo/api/examine'
 //粮脉企业审核删除
 export const API_POST_DELETE_SETTLED = '/settledCompanyInfo/api/deleteSettledCompanyInfo'
+//客服留言列表
+export const API_GET_OPENSERVICE_LIST = '/openServiceInfo/selectOpenServiceList'
 

src/api/V2/statisticalReport/index.js

@@ -104,4 +104,6 @@ export const API_GET_YUNSHUNUMBER = '/tranTaskInfo/selectTask'
 // 火运，船运实际价格
 export const API_POST_YUNSHUSETPRICE = '/tranProcessInfo/api/setUpTranPrice'
 //汽运请款
-export const API_POST_SUBMITLOGISTICS = '/tranSettlementReport/api/submitLogistics'
+export const API_POST_SUBMITLOGISTICS = '/tranSettlementReport/api/submitLogistics'
+//船运反馈接口
+export const API_POST_EDITTRANTASK = '/tranTaskInfo/api/editTranTask'

src/lang/zh.js

@@ -647,6 +647,7 @@ export default {
     //平台审核
     platformaudit: '平台审核',
     grainmerchantreview: '粮商审核',
+    customerService :'客服留言',
     driverreview: '司机审核',
     transactioninformationreview: '采购信息审核',
     saletransactioninformationreview: '销售信息审核',
@@ -1098,7 +1099,7 @@ export default {
     weighingManagement: '检斤管理',
     qualityInspectionManagement: '质检管理',
     newQualityInspectionManagement: '质检管理',
-    outInspectRecord:"质检记录",
+    outInspectRecord:'质检记录',
     qualityInspection: '质检信息',
     weighingManagementrecord:'检斤记录',
     collectionManagement: '收款管理',
@@ -7530,7 +7531,7 @@ export default {
     weighingManagement: '检斤管理',
     qualityInspectionManagement: '质检管理',
     newQualityInspectionManagement: '质检管理',
-    outInspectRecord:"质检记录",
+    outInspectRecord:'质检记录',
     qualityInspection: '质检信息',
     weighingManagementrecord:'检斤记录',
     collectionManagement: '收款管理',

src/model/platformaudit/index.js

@@ -12,6 +12,7 @@ import {
     API_POST_DELETESALE,
     API_POST_SALEREVIEW,
     API_GET_DYNAMICS_LIST,
+    API_GET_OPENSERVICE_LIST,
     API_GET_DYNAMICS_LOOK,
     API_POST_DYNAMICS_DELETE,
     API_POST_DYNAMICS_EXAMINE,
@@ -60,3 +61,5 @@ export const editSettled = appRx.post(API_POST_EDIT_SETTLEDCOMPANY, errorCatcher
 export const settledExamine = appRx.post(API_POST_SETTLED_EXAMINE, errorCatcher, errorHandle, filter)
 //粮脉企业审核删除
 export const deleteSettled = appRx.post(API_POST_DELETE_SETTLED, errorCatcher, errorHandle, filter)
+//客服留言列表
+export const openServiceList = appRx.get(API_GET_OPENSERVICE_LIST,errorCatcher, errorHandle, filter)

src/model/statisticalReport/index.js

@@ -49,7 +49,8 @@ import {
     API_POST_YUNSHUSETPRICE,
     API_POST_EDIT_SETTLEMENTWEIGHT,
     API_POST_INVOICELIST,
-    API_POST_SUBMITLOGISTICS
+    API_POST_SUBMITLOGISTICS,
+    API_POST_EDITTRANTASK
 } from '@/api/V2/statisticalReport'
 //期货采购入库报表
 export const getpurchreceipt = appRx.get(API_GET_PURCHRECEIPT, errorCatcher, errorHandle, filter)
@@ -159,4 +160,6 @@ export const getYunShuNumber= appRx.get(API_GET_YUNSHUNUMBER, errorCatcher, erro
 // 火运，船运实际价格
 export const SetYunShuPrice = appRx.post(API_POST_YUNSHUSETPRICE, errorCatcher, errorHandle, filter)
 // 汽运请款
-export const submitlogistics = appRx.post(API_POST_SUBMITLOGISTICS, errorCatcher, errorHandle, filter)
+export const submitlogistics = appRx.post(API_POST_SUBMITLOGISTICS, errorCatcher, errorHandle, filter)
+// 船运反馈
+export const edittrantask = appRx.post(API_POST_EDITTRANTASK, errorCatcher, errorHandle, filter)

src/views/contractManagement/acquisitionContract.vue

@@ -65,7 +65,8 @@
       </el-table-column>
       <!-- <el-table-column prop="packingMethod" label="包装方式"> </el-table-column> -->
       <el-table-column prop="buyer" label="收购方"> </el-table-column>
-      <el-table-column prop="seller" label="合营方"> </el-table-column>
+      <el-table-column prop="seller" label="卖方"> </el-table-column>
+      <el-table-column prop="jointVentureParties" label="合营方"> </el-table-column>
       <el-table-column width='120' prop="completedQuantity" label="已完成（吨）">
         <template slot-scope="scope">
           <span style="color: #5473e8; font-weight: 600">{{

src/views/contractManagement/acquisitionContractAdd.vue

@@ -31,8 +31,20 @@
     </el-row>
       </div>
       <ws-info-table>
-        <!--合同编号-->
-        <ws-form-item label="合同编号" span="1" prop="contractNo" class="readonly" required>
+        <!-- <ws-form-item label="合同类型" span="1" prop="agreementType" class="readonly">
+          <el-radio v-model="deptBudgetList.agreementType" label="收购合同">收购合同</el-radio>
+          <el-radio v-model="deptBudgetList.agreementType" label="补充协议">补充协议</el-radio>
+        </ws-form-item>
+         <ws-form-item prop="agreementNo" label="关联合同" span="1" v-show="deptBudgetList.agreementType =='补充协议'">
+          <ws-select v-model="deptBudgetList.agreementNo" placeholder="请选择编号" @change="selectRelation">
+            <ws-option v-for="item in contractNoList"  :key="item.id" :label="item.contractNo"
+              :value="item.contractNo"></ws-option>
+          </ws-select>
+        </ws-form-item>
+        <ws-form-item v-show="deptBudgetList.agreementType == '补充协议'" label="补充协议编号" span="1" prop="contractNo">
+          <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入补充协议编号" maxlength="100" size="small" />
+        </ws-form-item> -->
+        <ws-form-item v-show="deptBudgetList.agreementType =='收购合同'" label="合同编号" span="1" prop="contractNo" class="readonly" required>
           <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入合同编号" maxlength="50" size="small" />
         </ws-form-item>
         <ws-form-item label="交易主体" span="1" prop="transactionSubject" class="readonly">
@@ -51,6 +63,9 @@
               :value="item.customerName" />
           </el-select>
         </ws-form-item>
+        <ws-form-item label="卖方" span="1" prop="seller">
+          <ws-input v-model="deptBudgetList.seller" placeholder="请输入卖方名称" maxlength="100" size="small" />
+        </ws-form-item>
         <ws-form-item label="交货方式" span="1" prop="seller" class="readonly">
           <el-radio v-model="deptBudgetList.deliverType" label="2">对方送货</el-radio>
           <el-radio v-model="deptBudgetList.deliverType" label="1">我方自提</el-radio>
@@ -61,15 +76,13 @@
               对方送货</el-radio>
             <el-radio v-model="deptBudgetList.deliverType" v-else label="2">对方送货</el-radio> -->
         </ws-form-item>
-         <!--卖方-->
         <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方" span="1" prop="seller" class="readonly">
           <!-- <ws-input v-model="deptBudgetList.seller" placeholder="请输入卖方名称" maxlength="100" size="small" /> -->
           <!-- <el-autocomplete class="inline-input" v-model="deptBudgetList.seller" :fetch-suggestions="querySearch2"
              @select="handleSelect"></el-autocomplete>
              -->
-            <el-select filterable  v-model="deptBudgetList.seller" placeholder="请选择合营方名称" class="typeselect" 
-            @change="sellerSelect" filterable clearable>
-
+            <el-select filterable  v-model="deptBudgetList.jointVentureParties" placeholder="请选择合营方名称" class="typeselect" 
+            @change="jointSelect" filterable clearable>
             <el-option v-for="(item,index) in customerinfo" :key="index"  :label="item.customerName"
               :value="item.customerName" />
           </el-select>
@@ -87,6 +100,9 @@
           <!-- <ws-input v-model.number="deptBudgetList.buyerPhone" placeholder="请输入买方电话" maxlength="100" size="small" /> -->
           <el-autocomplete class="inline-input" v-model="deptBudgetList.buyerPhone" :fetch-suggestions="querySearch3"
             placeholder="请输入收购方电话" @select="handleSelect"></el-autocomplete>
+        </ws-form-item>
+        <ws-form-item  label="卖方电话" span="1" prop="sellerPhone">
+          <ws-input v-model="deptBudgetList.sellerPhone" placeholder="请输入卖方电话" maxlength="100" size="small" />
         </ws-form-item>
          <!--交货日期（止）-->
         <ws-form-item label="交货日期（止）" span="1" prop="deliveryDateEnd">
@@ -95,7 +111,7 @@
         </ws-form-item>
         <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方电话" span="1" prop="sellerPhone">
           <!-- <ws-input v-model="deptBudgetList.sellerPhone" placeholder="请输入卖方电话" maxlength="100" size="small" /> -->
-          <el-autocomplete class="inline-input" v-model="deptBudgetList.sellerPhone" :fetch-suggestions="querySearch4"
+          <el-autocomplete class="inline-input" v-model="deptBudgetList.jointPhone" :fetch-suggestions="querySearch4"
             placeholder="请输入合营方电话" @select="handleSelect"></el-autocomplete>
         </ws-form-item>
          <!--价格类型-->
@@ -369,6 +385,7 @@ import { isUndefined } from 'xe-utils/methods'
           placeDelivery:'',
           addressUrl: '',
           sellerPhone:'',
+          seller:'无',
           buyer:localStorage.getItem('ws-pf_compName'),
           buyerPhone:'',
           personPhone:'',
@@ -467,12 +484,12 @@ import { isUndefined } from 'xe-utils/methods'
       handleSelect(item) {
         console.log(item);
       },
-      sellerSelect(item) {
+      jointSelect(item) {
         console.log(item)
         for (let i = 0; i < this.customerinfo.length; i++) {
           console.log(this.customerinfo[i].customerName,item)
           if(this.customerinfo[i].customerName==item){
-            this.deptBudgetList.sellerPhone=this.customerinfo[i].customerPhone
+            this.deptBudgetList.jointPhone=this.customerinfo[i].customerPhone
           }
         }
       },
@@ -669,6 +686,14 @@ import { isUndefined } from 'xe-utils/methods'
             _obj.staffMobilePhone = "(默认)"
             this.feedbackLeaders.unshift(_obj)
           })
+          getRelationContractNo({
+            agreementType: '收购合同',
+            goodsType: 1
+          })
+          .toPromise()
+          .then((response) => {
+            this.contractNoList = response
+          })
           getcustomerinfo({compId: localStorage.getItem('ws-pf_compId'),}).toPromise()
           .then((response) => {
             var arr=[]
@@ -751,14 +776,14 @@ import { isUndefined } from 'xe-utils/methods'
           return
         }
        if(this.deptBudgetList.transactionSubject == '合营'){
-        if (!this.deptBudgetList.seller) {
+        if (!this.deptBudgetList.jointVentureParties) {
           this.$message({
             message: '请输入合营方名称！',
             type: 'warning',
           })
           return
         }
-        if (this.deptBudgetList.seller.length > 30) {
+        if (this.deptBudgetList.jointVentureParties.length > 30) {
           this.$message({
             message: '合营方名称长度不符合要求,请输入30个字符之内！',
             type: 'warning',
@@ -782,7 +807,7 @@ import { isUndefined } from 'xe-utils/methods'
           return
         }
         if(this.deptBudgetList.transactionSubject == '合营'){
-        if (!this.deptBudgetList.sellerPhone) {
+        if (!this.deptBudgetList.jointPhone) {
           this.$message({
             message: '请输入合营方电话！',
             type: 'warning',

src/views/contractManagement/acquisitionContractEdit.vue

@@ -30,11 +30,14 @@
         <ws-form-item class="readonly" label="收购方" span="1" prop="buyer">
           {{ deptBudgetList.buyer }}
         </ws-form-item>
+        <ws-form-item class="readonly" label="卖方" span="1" prop="buyer">
+          {{ deptBudgetList.seller }}
+        </ws-form-item>
         <!-- 交货方式 -->
         <ws-form-item class="readonly" label="交货方式" span="1" prop="sourceGoods">
           {{ deptBudgetList.deliverType1 }}
         </ws-form-item>
-        <ws-form-item  v-if="deptBudgetList.transactionSubject == '合营'" class="readonly" label="合营方" span="1" prop="seller">{{ deptBudgetList.seller }}
+        <ws-form-item  v-if="deptBudgetList.transactionSubject == '合营'" class="readonly" label="合营方" span="1" prop="seller">{{ deptBudgetList.jointVentureParties }}
         </ws-form-item>
         <!-- 交货日期（起） -->
         <ws-form-item label="交货日期（起）" span="1" prop="deliveryDateStart">
@@ -44,13 +47,16 @@
         <ws-form-item label="收购方电话" span="1" prop="buyerPhone">
           <ws-input v-model="deptBudgetList.buyerPhone" maxlength="100" size="small" />
         </ws-form-item>
+        <ws-form-item class="readonly" label="卖方电话" span="1" prop="buyer">
+          <ws-input v-model="deptBudgetList.sellerPhone" maxlength="100" size="small" />
+        </ws-form-item>
         <!-- 交货日期（止） -->
         <ws-form-item label="交货日期（止）" span="1" prop="deliveryDateEnd">
           <ws-date-picker v-model="deptBudgetList.deliveryDateEnd" type="date" placeholder="请选择交货日期（止）"
             value-format="yyyy-MM-dd" />
         </ws-form-item>
         <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方电话" span="1" prop="sellerPhone">
-          <ws-input v-model="deptBudgetList.sellerPhone" maxlength="100" size="small" placeholder="请输入合营方电话" />
+          <ws-input v-model="deptBudgetList.jointPhone" maxlength="100" size="small" placeholder="请输入合营方电话" />
         </ws-form-item>
         <!--价格类型-->
           <ws-form-item label="价格类型" span="1" prop="priceType">          

src/views/contractManagement/acquisitionContractExamine.vue

@@ -55,21 +55,25 @@
         <ws-form-item label="收购方" span="1" prop="buyer">
           {{ deptBudgetList.buyer }}
         </ws-form-item>
-        
+        <ws-form-item label="卖方" span="1" prop="buyer">
+          {{ deptBudgetList.sellerer }}
+        </ws-form-item>
         <ws-form-item label="交货方式" span="1" prop="deliverType1">{{ deptBudgetList.deliverType1 }}
         </ws-form-item>
-        <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方" span="1" prop="seller">{{ deptBudgetList.seller }}
+        <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方" span="1" prop="seller">{{ deptBudgetList.jointVentureParties }}
         </ws-form-item>
         <ws-form-item label="交货日期（起）" span="1" prop="deliveryDateStart">
           {{ deptBudgetList.deliveryDateStart }}
         </ws-form-item>
         <ws-form-item label="收购方电话" span="1" prop="buyerPhone">{{ deptBudgetList.buyerPhone }}
         </ws-form-item>
+        <ws-form-item label="卖方电话" span="1" prop="buyerPhone">{{ deptBudgetList.sellerPhone }}
+        </ws-form-item>
         <ws-form-item label="交货日期（止）" span="1" prop="deliveryDateEnd">
           {{ deptBudgetList.deliveryDateEnd }}
         </ws-form-item>
         <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方电话" span="1" prop="sellerPhone">
-          {{ deptBudgetList.sellerPhone }}
+          {{ deptBudgetList.jointPhone }}
         </ws-form-item>
         <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营加价" span="1" prop="seller" class="readonly">
           {{ deptBudgetList.jointVentureMarkup }}

src/views/contractManagement/purchaseContractAdd.vue

@@ -80,6 +80,18 @@
           <el-radio v-model="deptBudgetList.transactionSubject" label="自营">自营</el-radio>
           <el-radio v-model="deptBudgetList.transactionSubject" label="合营">合营</el-radio>
         </ws-form-item>
+        <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方" span="1" prop="seller" class="readonly">
+            <el-select filterable  v-model="deptBudgetList.jointVentureParties" placeholder="请选择合营方名称" class="typeselect" 
+            @change="jointSelect" filterable clearable>
+            <el-option v-for="(item,index) in customerinfo" :key="index"  :label="item.customerName"
+              :value="item.customerName" />
+          </el-select>
+        </ws-form-item>
+        <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方电话" span="1" prop="sellerPhone">
+          <!-- <ws-input v-model="deptBudgetList.sellerPhone" placeholder="请输入卖方电话" maxlength="100" size="small" /> -->
+          <el-autocomplete class="inline-input" v-model="deptBudgetList.jointPhone" :fetch-suggestions="querySearch4"
+            placeholder="请输入合营方电话" @select="handleSelect"></el-autocomplete>
+        </ws-form-item>
         <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营加价" span="1" prop="seller" class="readonly">
           <ws-input v-model="deptBudgetList.jointVentureMarkup" placeholder="请输入合营加价" maxlength="3"
             size="small" />
@@ -600,6 +612,15 @@ import { isUndefined } from 'xe-utils/methods'
       if (!this.restaurants4) this.restaurants4 = [];
     },
     methods: {
+      jointSelect(item) {
+        console.log(item)
+        for (let i = 0; i < this.customerinfo.length; i++) {
+          console.log(this.customerinfo[i].customerName,item)
+          if(this.customerinfo[i].customerName==item){
+            this.deptBudgetList.jointPhone=this.customerinfo[i].customerPhone
+          }
+        }
+      },
       copySelect(e){
         for (let i = 0; i < this.outContractNo.length; i++) {
           if(this.outContractNo[i].contractNo==e){
@@ -971,6 +992,20 @@ import { isUndefined } from 'xe-utils/methods'
 
       submit() {
         if(this.deptBudgetList.transactionSubject == '合营'){
+          if (!this.deptBudgetList.jointVentureParties) {
+          this.$message({
+            message: '请输入合营方名称！',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.deptBudgetList.jointVentureParties.length > 30) {
+          this.$message({
+            message: '合营方名称长度不符合要求,请输入30个字符之内！',
+            type: 'warning',
+          })
+          return
+        }
         if(!this.deptBudgetList.jointVentureMarkup&&this.deptBudgetList.jointVentureMarkup!=0){
           this.$message({
             message: '请输入合营加价！',
@@ -985,6 +1020,8 @@ import { isUndefined } from 'xe-utils/methods'
           })
           return
         }
+
+        
        }
         // if(this.deptBudgetList.placeDelivery.indexOf('省')>-1){
         //       this.$message({

src/views/contractManagement/purchaseContractEdit.vue

@@ -30,6 +30,11 @@
         <ws-form-item label="交易主体" span="1" prop="transactionSubject" class="readonly">
           {{deptBudgetList.transactionSubject}}
         </ws-form-item>
+        <ws-form-item  v-if="deptBudgetList.transactionSubject == '合营'" class="readonly" label="合营方" span="1" prop="seller">{{ deptBudgetList.jointVentureParties }}
+        </ws-form-item>
+        <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方电话" span="1" prop="sellerPhone">
+          <ws-input v-model="deptBudgetList.jointPhone" maxlength="100" size="small" placeholder="请输入合营方电话" />
+        </ws-form-item>
         <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营加价" span="1" prop="seller" class="readonly">
           <ws-input v-model="deptBudgetList.jointVentureMarkup" placeholder="请输入合营加价" maxlength="3"
             size="small" />
@@ -738,6 +743,27 @@
       },
       submit() {
         if(this.deptBudgetList.transactionSubject == '合营'){
+          if (!this.deptBudgetList.jointVentureParties) {
+          this.$message({
+            message: '请输入合营方名称！',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.deptBudgetList.jointVentureParties.length > 30) {
+          this.$message({
+            message: '合营方名称长度不符合要求,请输入30个字符之内！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.deptBudgetList.jointPhone) {
+          this.$message({
+            message: '请输入合营方电话！',
+            type: 'warning',
+          })
+          return
+        }
         if(!this.deptBudgetList.jointVentureMarkup&&this.deptBudgetList.jointVentureMarkup!=0){
           this.$message({
             message: '请输入合营加价！',

src/views/contractManagement/purchaseContractExamine.vue

@@ -55,6 +55,11 @@
         <ws-form-item label="交易主体" span="1" prop="transactionSubject" class="readonly">
           {{deptBudgetList.transactionSubject}}
         </ws-form-item>
+        <ws-form-item  v-if="deptBudgetList.transactionSubject == '合营'" class="readonly" label="合营方" span="1" prop="seller">{{ deptBudgetList.jointVentureParties }}
+        </ws-form-item>
+        <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方电话" span="1" prop="jointPhone">
+          {{deptBudgetList.jointPhone}}
+        </ws-form-item>
         <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营加价" span="1" prop="seller" class="readonly">
           {{ deptBudgetList.jointVentureMarkup }}
         </ws-form-item>

src/views/contractManagement/salesContractAdd.vue

@@ -47,6 +47,18 @@
           <ws-form-item label="交易主体" span="1" prop="transactionSubject" class="readonly">
           <el-radio v-model="deptBudgetList.transactionSubject" label="自营">自营</el-radio>
           <el-radio v-model="deptBudgetList.transactionSubject" label="合营">合营</el-radio>
+        </ws-form-item>
+        <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方" span="1" prop="seller" class="readonly">
+            <el-select filterable  v-model="deptBudgetList.jointVentureParties" placeholder="请选择合营方名称" class="typeselect" 
+            @change="jointSelect" filterable clearable>
+            <el-option v-for="(item,index) in customerinfo" :key="index"  :label="item.customerName"
+              :value="item.customerName" />
+          </el-select>
+        </ws-form-item>
+        <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方电话" span="1" prop="sellerPhone">
+          <!-- <ws-input v-model="deptBudgetList.sellerPhone" placeholder="请输入卖方电话" maxlength="100" size="small" /> -->
+          <el-autocomplete class="inline-input" v-model="deptBudgetList.jointPhone" :fetch-suggestions="querySearch4"
+            placeholder="请输入合营方电话" @select="handleSelect"></el-autocomplete>
         </ws-form-item>
           <!--关联合同-->
           <ws-form-item prop="agreementNo" label="关联合同" span="1" v-if="deptBudgetList.agreementType == '补充协议'">
@@ -558,6 +570,15 @@
       if (!this.restaurants4) this.restaurants4 = [];
     },
     methods: {
+      jointSelect(item) {
+        console.log(item)
+        for (let i = 0; i < this.customerinfo.length; i++) {
+          console.log(this.customerinfo[i].customerName,item)
+          if(this.customerinfo[i].customerName==item){
+            this.deptBudgetList.jointPhone=this.customerinfo[i].customerPhone
+          }
+        }
+      },
       copySelect(e){
         for (let i = 0; i < this.outContractNo.length; i++) {
           if(this.outContractNo[i].contractNo==e){
@@ -840,20 +861,43 @@
       },
 
       submit() {
-          if(this.deptBudgetList.placeDelivery.indexOf('省')>-1){
-              this.$message({
-            message: '请手动删除详细地址中省市区/市，避免重复显示省市区/市！',
+        if(this.deptBudgetList.transactionSubject == '合营'){
+          if (!this.deptBudgetList.jointVentureParties) {
+          this.$message({
+            message: '请输入合营方名称！',
             type: 'warning',
           })
           return
         }
-        if(this.deptBudgetList.sourceGoods.indexOf('省')>-1){
+        if (this.deptBudgetList.jointVentureParties.length > 30) {
           this.$message({
-          message: '请手动删除详细地址中省市区/市，避免重复显示省市区/市！',
-          type: 'warning',
+            message: '合营方名称长度不符合要求,请输入30个字符之内！',
+            type: 'warning',
           })
           return
         }
+        if (!this.deptBudgetList.jointPhone) {
+          this.$message({
+            message: '请输入合营方电话！',
+            type: 'warning',
+          })
+          return
+        }
+       }
+        //   if(this.deptBudgetList.placeDelivery.indexOf('省')>-1){
+        //       this.$message({
+        //     message: '请手动删除详细地址中省市区/市，避免重复显示省市区/市！',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if(this.deptBudgetList.sourceGoods.indexOf('省')>-1){
+        //   this.$message({
+        //   message: '请手动删除详细地址中省市区/市，避免重复显示省市区/市！',
+        //   type: 'warning',
+        //   })
+        //   return
+        // }
         if (!this.deptBudgetList.contractNo) {
           this.$message({
             message: '合同编号不能为空',

src/views/contractManagement/salesContractEdit.vue

@@ -38,6 +38,11 @@
           </ws-form-item>
           <ws-form-item label="交易主体" span="1" prop="transactionSubject" class="readonly">
           {{deptBudgetList.transactionSubject}}
+        </ws-form-item>
+        <ws-form-item  v-if="deptBudgetList.transactionSubject == '合营'" class="readonly" label="合营方" span="1" prop="seller">{{ deptBudgetList.jointVentureParties }}
+        </ws-form-item>
+        <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方电话" span="1" prop="sellerPhone">
+          <ws-input v-model="deptBudgetList.jointPhone" maxlength="100" size="small" placeholder="请输入合营方电话" />
         </ws-form-item>
           <!--关联合同-->
           <ws-form-item prop="agreementNo" label="关联合同" span="1" v-if="deptBudgetList.agreementType == '补充协议'">

src/views/contractManagement/salesContractExamine.vue

@@ -61,6 +61,13 @@
           <div class="unchanged">
               {{deptBudgetList.transactionSubject}}
             </div>
+        </ws-form-item>
+        <ws-form-item  v-if="deptBudgetList.transactionSubject == '合营'" class="readonly" label="合营方" span="1" prop="seller">
+          <div class="unchanged">{{ deptBudgetList.jointVentureParties }}</div>
+          
+        </ws-form-item>
+        <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方电话" span="1" prop="jointPhone">
+          <div class="unchanged">{{deptBudgetList.jointPhone}}</div>
         </ws-form-item>
           <ws-form-item label="关联合同" v-if="deptBudgetList.agreementType=='补充协议'" span="1" prop="agreementNo">
             <div class="unchanged">

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -377,10 +377,11 @@ export default {
             this.baseInfoForm.bulkDensityStandard = ''
           }
           this.baseInfoForm.goodsNameKey = response[0].constKey
-        } else {
+        } else{
           this.goodnameList = _list
           if (_list.length != 0) {
             this.selectVal = _list[0].constValue
+            // this.selectVal = _goodsNameList[0]
             if (this.selectVal == '玉米淀粉' ||
             this.selectVal == '玉米（机收）' ||
             this.selectVal == '玉米（酒精）' ||
@@ -517,9 +518,24 @@ export default {
         .toPromise()
         .then((response) => {
           this.baseInfoForm = response
+          this.selectVal = this.baseInfoForm.goodsName
           //构造查看priceList数据
           this.priceList = []
           this.makeLookPriceList()
+          if (this.selectVal == '玉米淀粉' ||
+            this.selectVal == '玉米（机收）' ||
+            this.selectVal == '玉米（酒精）' ||
+            this.selectVal == '玉米（筛漏）' ||
+            this.selectVal == '玉米（陈粮）' ||
+            this.selectVal == '玉米（棒）' ||
+            this.selectVal == '玉米'
+          ) {
+            this.isSolidFood = true
+            this.baseInfoForm.bulkDensityStandard = 1
+          } else {
+            this.isSolidFood = false
+            this.baseInfoForm.bulkDensityStandard = ''
+          }
           if (this.$route.query.type != '新增') {
             let _data = this.priceList
             this.checkList1 = []

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -266,7 +266,7 @@
                   </el-select>
                 </ws-form-item>
                 <ws-form-item
-                  v-if='serviceManagementType == 1 || serviceManagementType == 3 && deptBudgetList.outType == "自运"'
+                  v-if='serviceManagementType == 1&&deptBudgetList.outType == "汽运" || serviceManagementType == 3 && deptBudgetList.outType == "自运"'
                   label="车队" span="1" prop="fleetName">
                   <el-select @change="fleetNameChange" :disabled='recheck' v-model="deptBudgetList.fleet" placeholder="非车队车辆">
                     <el-option  key="0" label="非车队"
@@ -311,7 +311,7 @@
                     " src="../../../public/img/edit.png" @click="editClick(3)" alt="" /> -->
                 </ws-form-item>
                 <ws-form-item label="车牌号" span="1" prop="shipName" v-if="deptBudgetList.outType == '散船'||deptBudgetList.outType == '集装箱船'">
-                  <ws-input 
+                  <ws-input :disabled="statusTypetext != '初检'"
                     v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
                 </ws-form-item>
                 <ws-form-item label="车厢号-1" span="1" prop="wingNumber" v-if="deptBudgetList.outType == '火运'">

src/views/platformAudit/component/routers/route.js

@@ -106,6 +106,21 @@ const platformauditRouter = {
                 _title: '粮脉动态审核'
             },
         },
+        // 客服留言
+        {
+            path: 'customerService',
+            component: () =>
+                import ( /* webpackChunkName: "applDetail" */ '@/views/platformaudit/customerService'),
+            name: 'customerService',
+            meta: {
+                title: 'customerService',
+                shortcutEntrance: 'customerService',
+                module: 'audit.grainMerchant.grainMerchantInfo',
+                permissicon: [],
+                keepAlive: true,
+                _title: '客服留言'
+            },
+        },
     ],
 };
 export default platformauditRouter;

src/views/platformAudit/customerService.vue

@@ -0,0 +1,142 @@
+<!--客服留言-->
+<template>
+  <div>
+    <BaseHeaderLayout :leftSpan="16">
+      <template slot="right">
+        <ws-input class='findinput' @keyup.enter.native="find()" v-model="searchKeyWord" placeholder="可按姓名、手机号查找"
+          clearable maxlength="500" type="input"></ws-input>
+        <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
+              vertical-align: text-top;
+              position: relative;
+              top: 0px;
+              left:-8px;
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
+      </template>
+    </BaseHeaderLayout>
+    <el-table :data="openList" style="width: 100%; margin-top: 20px" ref="openList" border height="calc(100% - 115px)">
+      <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="name" label="姓名"> </el-table-column>
+        <el-table-column prop="mobilePhone" label="手机号"> </el-table-column>
+        <el-table-column prop="message" label="信息"></el-table-column>
+        <el-table-column prop="createDate" label="创建时间"> </el-table-column>
+    </el-table>
+    <div style="text-align: center;">
+      <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>
+</template>
+<script>
+  import {
+    openServiceList,
+  } from '@/model/platformaudit/index'
+  export default {
+    data() {
+      return {
+        searchKeyWord: '',
+        openList: [],
+        currentPage: 1,
+        pageSize: 10,
+        deptBudgetTotal: 0,
+        deptCircularPage: {},
+      }
+    },
+    activated() {
+      this.getList()
+    },
+    methods: {
+      find() {
+        this.getList()
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      getList() {
+        openServiceList({
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchKeyWord: this.searchKeyWord,
+          })
+          .toPromise()
+          .then((response) => {
+            this.openList = response.records
+            this.deptBudgetTotal = response.total
+          })
+      },
+    },
+  }
+</script>
+<style lang="scss" scoped>
+  .seach {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .find {
+      width: 32px;
+      margin-left: 10px;
+    }
+
+    .search-left {
+      display: flex;
+    }
+  }
+
+  .ws-info-table {
+    border: none;
+  }
+
+  .ws-info-table .el-form-item {
+    width: 50%;
+    border: none;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__label {
+    width: 30%;
+    text-align: center;
+    background: #ffffff;
+    color: #8890b1;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
+    border: none;
+  }
+
+  /deep/.el-table .el-table__header .cell,
+  .el-table .el-table__body .cell {
+    text-align: center;
+  }
+
+  /deep/.el-table--enable-row-transition .el-table__body td {
+    text-align: center;
+  }
+
+  /deep/.base_header_layout .find.el-button--primary {
+    width: 30px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.base_header_layout .findinput input {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  //   /deep/.el-table--border{
+  //   height: calc(100vh - 600px) !important;
+  // }
+</style>

src/views/statisticalReport/autoSettlementList.vue

@@ -137,7 +137,32 @@
             " width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
               src="../../../public/img/edit.png" @click="editdeductionAmount(scope.row)" alt="" />
           </template></el-table-column>
+          <el-table-column width="100" class="table_td" label="服务费(元)" prop="serviceCharge">
+            <template slot-scope="scope">
+            <span v-if="
+              !scope.row.serviceChargechange && scope.row.serviceCharge
+            ">{{ scope.row.serviceCharge }}</span>
+            <input v-if="scope.row.serviceChargechange" style="width: 60px" v-model="serviceCharge" type="text" />
+            <!--改服务费-->
+            <i @click="changeserviceCharge(scope.row)" v-if="
+              (scope.row.serviceChargechange &&
+                scope.row.status == '待请款') ||
+              (scope.row.serviceChargechange &&
+                scope.row.status == '已驳回')
+            " class="iconfont icon-dui"></i>
+            <img v-if="
+              (!scope.row.serviceChargechange &&
+                scope.row.status == '待请款') ||
+              (!scope.row.serviceChargechange &&
+                scope.row.status == '已驳回')
+            " width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
+              src="../../../public/img/edit.png" @click="editserviceCharge(scope.row)" alt="" />
+          </template>
+          </el-table-column>
+          <el-table-column width="100" class="table_td" label="实付金额(元)" prop="amountActuallyPaid"></el-table-column>
+          <el-table-column width="100" class="table_td" label="税点(元)" prop="taxPoint"></el-table-column>
         <el-table-column width="100" class="table_td" label="应付金额(元)" prop="amountIngPayable"></el-table-column>
+        <el-table-column width="100" class="table_td" label="合计应付(元)" prop="totalPayable"></el-table-column>
         <el-table-column width="100" class="table_td" label="已付金额(元)" prop="amountEdPayable"><template
             slot-scope="scope">
             <div style="
@@ -395,6 +420,7 @@ export default {
       isHover: false,
       settlementWeightchange: false,
       deductionAmountchange: false,
+      serviceChargechange: false,
       isShow: !this.autohide,
       //弹出框
       dialogViewSpareMoney: false,
@@ -550,9 +576,9 @@ export default {
       var m = date.getMonth() + 1;
       var d = date.getDate();
 
-      m = m < 10 ? "0" + m : m;
-      d = d < 10 ? "0" + d : d;
-      return y + "-" + m + "-" + d;
+      m = m < 10 ? '0' + m : m;
+      d = d < 10 ? '0' + d : d;
+      return y + '-' + m + '-' + d;
     },
     selectInit(row) {
       //在这里一定要记得类型匹配的上。
@@ -920,6 +946,48 @@ export default {
       this.deductionAmount = item.deductionAmount
       item.deductionAmountchange = true
     },
+    //修改服务费
+    changeserviceCharge(item) {
+      if (!this.serviceCharge) {
+        this.$message({
+          message: '服务费金额不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        (this.serviceCharge &&
+          String(this.serviceCharge).indexOf('.') != -1 &&
+          String(this.serviceCharge).length -
+          (String(this.serviceCharge).indexOf('.') + 1) >
+          2) ||
+        (this.serviceCharge && this.serviceCharge > 100000) ||
+        (this.serviceCharge && this.serviceCharge < -100000)
+      ) {
+        this.$message({
+          message: '服务费输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      editauto({
+        serviceCharge: this.serviceCharge,
+        id: item.id,
+        flag: 4,
+      })
+        .toPromise()
+        .then((response) => {
+          this.$message.success('修改服务费成功')
+          this.getList()
+        })
+        .catch((req) => {
+          this.$message.warning('修改服务费失败')
+        })
+    },
+    editserviceCharge(item) {
+      this.serviceCharge = item.serviceCharge
+      item.serviceChargechange = true
+    },
     //装车磅单
     lookloadingImg(row) {
       if (row.loadingImg == null || row.loadingImg == '') {

src/views/statisticalReport/shippingList.vue

@@ -52,7 +52,10 @@
         </el-col>
         <el-col :span="18">
           <div v-if="contractNo!='全部合同'">
-            <span style="display:inline-block;margin-right:10px;">船名：{{shipName}}</span> <span style="display:inline-block;margin-right:10px;">航次：{{shipNo}}</span>  <div style="display:inline-block;margin-right:10px;"> 装船重量（吨）：<ws-button v-if="shippedWeight==0" type="primary" @click="handlefeedback()">反馈</ws-button></div>
+            <span style="display:inline-block;margin-right:10px;">船名：{{shipName}}</span> 
+            <span style="display:inline-block;margin-right:10px;">航次：{{shipNo}}</span>  
+            <div style="display:inline-block;margin-right:10px;"> 水单装船重量（吨）：<span v-if="shippedWeight>0">{{shippedWeight}}<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/fujian.png" @click="fujian1(scope.row)" alt="" /></span><ws-button v-if="shippedWeight==0" type="primary" @click="handlefeedback()">反馈</ws-button></div>
           </div>
         </el-col>
       </el-row>
@@ -93,7 +96,10 @@
         <el-table-column class="table_td" prop="taskNo" label="运输任务"></el-table-column>
         <el-table-column class="table_td" prop="shipType" label="类型"></el-table-column>
         <el-table-column class="table_td" prop="carNo" label="车牌号"></el-table-column>
-        <el-table-column class="boxNo" prop="boxNo" label="箱号/仓位号"></el-table-column>
+        <el-table-column class="boxNo" prop="boxNo" label="箱号-1"></el-table-column>
+        <el-table-column class="boxNo" prop="boxNoOther" label="箱号-2"></el-table-column>
+        <el-table-column class="boxNo" prop="titleNo" label="封号-1"></el-table-column>
+        <el-table-column class="boxNo" prop="titleNoOther" label="封号-2"></el-table-column>
         <el-table-column class="table_td" prop="loadingWeight" label="装车净重（吨）"></el-table-column>
         <el-table-column class="table_td" prop="unloadingWeight" label="卸车净重(吨)">
         </el-table-column>
@@ -224,7 +230,17 @@
         </el-form-item>
       </el-form>
         <ws-upload ref="upload" :comp-id="compId" :appendix-ids="enclosure" 
+        @onChange="onChange"
 				accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" />
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="editshow = false">取 消</el-button>
+        <el-button @click="taskconfirm">确定</el-button>
+      </div>
+    </WinseaContentModal>
+    <WinseaContentModal v-model="accessoryTFs1" :title="$t('system.noticeCircular.information')"
+      @on-cancel="accessoryTFs1 = false">
+        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="enclosure" :editable="false"
+				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
     </WinseaContentModal>
     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
       @on-cancel="accessoryTFs = false">
@@ -363,7 +379,7 @@
         orderList: {},
         deptBudgetList: {},
         id: '',
-
+        currecttask:{},
         pcFlag: 1,
         carryoverlist: {},
         modification: [],
@@ -387,7 +403,8 @@
         },
         shipName:'',
         shipNo:'',
-        editshow:true,
+        enclosure:'',
+        editshow:false,
         amountNotPayable: 0,
         amountEdPayable: 0,
         paymentScreenshotUrls: [],
@@ -409,9 +426,28 @@
       this.showType = this.isShow
     },
     methods: {
+      onChange() {
+        this.$refs.upload
+          .handleSaveBill()
+          .then(async response => {
+            this.enclosure = response
+          })
+          .catch(res => {
+            EventBus.$emit('error', (JSON.parse(res) || {}).message)
+            this.$refs.upload.clearFiles()
+          })
+      },
       handlefeedback(){
         this.editshow=true
       },
+      taskconfirm(){
+        edittrantask({id:this.currecttask.id,shippedWeight:this.shippedWeight,enclosure:this.enclosure,tranProcessInfoList:[]}).toPromise().then((response) => {
+              this.editshow=false
+            })
+            .catch((response) => {
+              EventBus.$emit('error', response.message)
+            })
+      },
       find(){
       this.getList()
     },
@@ -426,6 +462,9 @@
         }
         // this.appendixIdss = row.addressUrl
       },
+      fujian1() {
+          this.accessoryTFs1 = true
+      },
       cur(status) {
         if (status == 0) {
           this.currect = true
@@ -949,6 +988,7 @@
               this.taskNo=response[0].taskNo
               this.shipName=response[0].shipName
               this.shipNo=response[0].shipNo
+              this.currecttask=response[0]
               this.getList()
             }
           })

src/views/warehousenew/warehousingOrder.vue

@@ -9,6 +9,15 @@
         </el-date-picker>
   
           </div>
+          <div style='width:50%;margin-right:10px;'>
+            <el-select v-model="warehouseName" filterable placeholder="" @change="warehouseNameChange" :value="searchType"
+          style="margin: 0 10px">
+          <el-option key="全部仓库" label="全部仓库" value=""
+            style="color: #8890b1" />
+          <el-option v-for="item in warehouseList" :key="'cangku' + item.warehouseName" :label="item.warehouseName" :value="item.id"
+            style="color: #8890b1" />
+        </el-select>
+          </div>
       </template>
       <template slot="right">
         <ws-input @keyup.enter.native="find()" class='findValue' v-model="searchKeyWord" placeholder="可按货源查找" clearable maxlength="300" type="input"></ws-input>
@@ -75,7 +84,7 @@
         </ws-button>
         </div>
       </div>
-      <el-table class="wenzi" :ref="'multipleTable'+index" :data="item.warehousingOrderList" style="width: 100%"  @selection-change="handleSelectionChange($event,item,index)" >
+      <el-table show-summary :summary-method="getSummaries" class="wenzi" :ref="'multipleTable'+index" :data="item.warehousingOrderList" style="width: 100%"  @selection-change="handleSelectionChange($event,item,index)" >
           <el-table-column
           :selectable='selectInit'
       type="selection"
@@ -477,6 +486,9 @@
   getenabledinfo,
   setenabledinfo
 } from '@/model/warehouse/index'
+import {
+  selectWarehouseSelf,
+} from '@/model/houseSelfCollect/index'
   import {getpayeeinfo,getbuypayeeinfo} from '@/model/profitable/index'
   import {
     downloadFile
@@ -606,6 +618,7 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
         spanArr: [],
         options1:[],
         id:'',
+        
         customerInfo:{},
         appendixIdss:[],
         paymentScreenshot:'',
@@ -626,6 +639,7 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             return time.getTime() > Date.now()
           },
         },
+        warehouseList:[],
         currectfocusdata:{},
         customershow:false,
         interestratevalue:'',
@@ -642,10 +656,52 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
     // },
     activated() {
       this.value2=this.getNowTime()
+      selectWarehouseSelf({
+        compId: localStorage.getItem('ws-pf_compId'),
+      })
+        .toPromise()
+        .then((response) => {
+          this.warehouseList=response
+          
+        })
       this.getList()
       this.showType = this.isShow
     },
     methods: {
+      getSummaries(param) {
+        const { columns, data } = param;
+        const sums = [];
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '合计';
+            return;
+          }
+          const values = data.map(item => Number(item[column.property]));
+          if (!values.every(value => isNaN(value))) {
+            if(index==8||index==9||index==10||index==11||index==12||index==13||index==14||index==15){
+              sums[index] = values.reduce((prev, curr) => {
+                const value = Number(curr);
+                if (!isNaN(value)) {
+                  return prev + curr;
+                } else {
+                  return prev;
+                }
+              }, 0).toFixed(2)
+            }
+            
+          } else {
+            sums[index] = '';
+          }
+        });
+
+        return sums;
+      },
+      warehouseNameChange(e){
+        if(e=='全部仓库'){
+          this.warehouseName=''
+        }
+        this.getList()
+      },
       handleClose5(){
         this.dialogVisiblecontent=false
       },
@@ -1556,6 +1612,7 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             endDate:this.endDate,
             currentPage: this.currentPage,
             pageSize: this.pageSize,
+            baseId:this.warehouseName,
             searchType: this.searchType,
             searchKeyWord: this.searchKeyWord,
           })