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

src/api/V2/contract/index.js

@@ -99,16 +99,4 @@ export const API_GET_FEERECORD = '/storageFeeRecordCharge/feeRecord'
 export const API_POST_STOP = '/storageFeeRecord/editInfo'
 
 // 代储费导出
-export const API_POST_STORAGEFEERECORDEXPORT = '/storageFeeRecord/export'
-// 合同费用列表
-export const API_CONTRACTCOST = '/contractCostInfo/selectInfo'
-// 合同编号
-export const API_GET_CONTRACT ='/warehouseBaseInfo/selectContractNoList'
-// 请款收款
-export const API_ADD_CONTRACT ='/contractCostInfo/api/addInfo'
-// 编辑请款收款
-export const API_EDIT_CONTRACT ='/contractCostInfo/editInfo'
-// 删除请款收款
-export const API_DELETE_CONTRACT ='/contractCostInfo/deleteInfo'
-// 付款
-export const API_PAYMENT ='/contractCostInfo/payment'
+export const API_POST_STORAGEFEERECORDEXPORT = '/storageFeeRecord/export'

src/lang/zh.js

@@ -484,7 +484,6 @@ export default {
     purchaseContract: '现货采购合同',
     collectionContract: '代收合同',
     storageContract:'代储合同',
-    purchaseContractcost:'现货采购合同  /  费用',
     purchaseContractAdd: '现货采购合同  /  添加',
     collectionContractAdd: '代收合同  /  添加',
     storageContractAdd:'代储合同  /  添加',
@@ -497,7 +496,6 @@ export default {
     storageContractRecord:'代储合同  /  记录',
     purchaseContractExamine: '现货采购合同  /  查看',
     salesContract: '现货销售合同',
-    salesContractcost: '现货销售合同  /  费用',
     salesContractEdit: '现货销售合同  /  编辑',
     salesContractExamine: '现货销售合同  /  查看',
     salesContractAudit: '现货销售合同  /  审核',
@@ -1048,11 +1046,6 @@ export default {
     settlement: '结算',
     inspectInfo: '质检信息',
     weightCheck: '检斤',
-    //利润核算
-    profitable:'利润核算',
-    contractOtherMoney: '合同外费用',
-    earningsLook: '盈收概览',
-    inOutDetailed: '收支明细',
 
     //出库管理
     outboundManagement: '出库管理',
@@ -7477,13 +7470,6 @@ export default {
     inspectInfo: '质检信息',
     weightCheck: '检斤'
   },
-  //利润核算
-  profitable:{
-    contractOtherMoney: '合同外费用',
-    earningsLook: '盈收概览',
-    inOutDetailed: '收支明细'
-  },
-  
   //出库管理
   outboundManagement: {
     weighingManagement: '检斤管理',

src/layout/index/top/index.vue

@@ -8,7 +8,6 @@
       <!-- </div>
     <div class="top-bar__title"> -->
       <!-- 面包屑 -->
-      
       <div class="top-bar__item top-bar__item--show">
         <top-menu v-if="showMenu"></top-menu>
         <bread-crumb v-if="!showMenu" />

src/model/contarct/index.js

@@ -42,13 +42,7 @@ import {
     API_POST_STORAGEFEERECORDCHARGE,
     API_GET_FEERECORD,
     API_POST_STOP,
-    API_POST_STORAGEFEERECORDEXPORT,
-    API_CONTRACTCOST,
-    API_GET_CONTRACT,
-    API_ADD_CONTRACT,
-    API_EDIT_CONTRACT,
-    API_DELETE_CONTRACT,
-    API_PAYMENT
+    API_POST_STORAGEFEERECORDEXPORT
 } from '@/api/V2/contract'
 // 列表
 export const getList = appRx.get(API_GET_CONTRACT_TENANT, errorCatcher, errorHandle, filter)
@@ -150,15 +144,3 @@ export const stopStorageFeeRecord = appRx.post(API_POST_STOP, errorCatcher, erro
 
 // 代储费导出
 export const exportStorageFee = appRx.post(API_POST_STORAGEFEERECORDEXPORT)
-// 合同费用列表
-export const contractcost = appRx.get(API_CONTRACTCOST, errorCatcher, errorHandle, filter)
-// 合同编号
-export const getcontract = appRx.get(API_GET_CONTRACT, errorCatcher, errorHandle, filter)
-// 请款收款
-export const addcontractcost = appRx.post(API_ADD_CONTRACT, errorCatcher, errorHandle, filter)
-// 编辑请款收款
-export const editcontractcost = appRx.post(API_EDIT_CONTRACT, errorCatcher, errorHandle, filter)
-// 删除请款收款
-export const delcontractcost = appRx.post(API_DELETE_CONTRACT, errorCatcher, errorHandle, filter)
-// 付款
-export const payment = appRx.post(API_PAYMENT, errorCatcher, errorHandle, filter)

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

@@ -26,21 +26,6 @@ const contractManagementRouter = {
         keepAlive: true
       }
     },
-    // 现货采购合同费用
-    {
-      path: 'buyContractcost',
-      component: () =>
-        import(/* webpackChunkName: "sparepartList" */ '@/views/contractManagement/purchaseContractCost'),
-      name: 'buyContractcost',
-      meta: {
-        title: 'purchaseContractcost',
-        shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.buyContract',
-        permissicon: [],
-        keepAlive: true
-      },
-      hidden: true
-    },
     //现货采购合同查看
     {
       path: 'purchaseContractExamine',
@@ -168,22 +153,6 @@ const contractManagementRouter = {
         // module: 'procurement.sparepart.applDetail'
       }
     },
-    //现货销售合同费用
-    {
-      path: 'salesContractcost',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/contractManagement/salesContractCost'),
-      name: 'salesContractcost',
-      meta: {
-        title: 'salesContractcost',
-        shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.salesContract',
-        permissicon: [],
-        keepAlive: true
-        // module: 'procurement.sparepart.applDetail'
-      },
-      hidden: true
-    },
     //现货销售合同查看
     {
       path: 'salesContractExamine',

src/views/contractManagement/purchaseContract.vue

@@ -159,17 +159,8 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column prop="address" label="操作" width="160">
+      <el-table-column prop="address" label="操作" width="140">
         <template slot-scope="scope">
-           <img width="16" height="17" style="
-                vertical-align: text-top;
-                position: relative;
-                top: -1px;
-                margin: 0 6px;
-              "  src="../../../public/img/daichu.png"
-               v-hasPermission="
-              `contractManagement.nonContract.nonContractInfo.view`"
-             @click="handlecost(scope.row)" alt="" />
           <img width="16" height="16" style="vertical-align: text-top; margin: 0 6px"
             src="../../../public/img/chakan.png" @click="handleExamine(scope.row)" v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.view`
@@ -195,7 +186,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <el-pagination :page-sizes="[10, 30, 50, 100, 500, 1000, 9999]" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+    <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>
 
@@ -357,17 +348,6 @@
       this.showType = this.isShow
     },
     methods: {
-      handlecost(row){
-         this.$router.push({
-          name: 'buyContractcost',
-          query: {
-            id: row.id,
-            contractNo: row.contractNo,
-            status:row.status,
-            seller:row.seller
-          },
-        })
-      },
       onChange() {
         this.$refs.upload
           .handleSaveBill()

src/views/contractManagement/purchaseContractAdd.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="container">
     <el-row>
-      <el-col :span="12"  class="bg">
+      <el-col :span="12">
         <h2 class="bg-left title">创建采购合同</h2>
       </el-col>
-      <el-col :span="12" class="bg-right bg">
+      <el-col :span="12" class="bg-right">
         <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()"><img width="6" height="10"
             style="vertical-align: bottom; margin-right: 3px" src="../../../public/img/lujing.png" alt="" />返回
         </el-button>
@@ -13,22 +13,9 @@
     <ws-form ref="deptBudgetList" :rules="rules" :model="deptBudgetList">
       <div class="remark">
         <h3>基本信息</h3>
-        <el-row>
-      <el-col :span="12">
         <p style="color: #8890b1">
           注：基本信息和货物信息均为必填项，“<span style="color:red">*</span>” 标记的条目提交后不可修改。
         </p>
-        </el-col>
-      <el-col :span="12" style='text-align:right;'>
-        <el-select v-model="contractNo" placeholder="请选择要复制的合同" class="typeselect" filterable clearable
-              @change="copySelect">
-              <el-option v-for="(item,index) in outContractNo" :key="'hetong'+index" :label="item.contractNo"
-                :value="item.contractNo" />
-            </el-select>
-            <el-button class="bg-bottom" type="primary" size="small" @click="cancelcopy()">取消复制
-        </el-button>
-         </el-col>
-    </el-row>
       </div>
       <ws-info-table>
         <!--合同类型-->
@@ -408,11 +395,10 @@
     delxiala,
     getstafffind,
     getRelationContractNo,
-    getcustomerinfo,
-    examineList
+    getcustomerinfo
   } from '@/model/contarct/index'
   import {
-    getstaff,xialaNo,
+    getstaff,
   } from '@/model/warehouse/index'
   import {
     regionData,
@@ -456,7 +442,6 @@ import { isUndefined } from 'xe-utils/methods'
         dialogApproveFormVisible: false,
         // 船舶类型
         monetaryKey: null,
-        contractNo:'',
         // 表格显示数据
         tableDate: [],
         // 是否显示
@@ -589,50 +574,6 @@ import { isUndefined } from 'xe-utils/methods'
           this.deptBudgetList.deliverType = '1'
         }
       },
-      copySelect(e){
-        for (let i = 0; i < this.outContractNo.length; i++) {
-          if(this.outContractNo[i].contractNo==e){
-            examineList({
-            id: this.outContractNo[i].id
-          })
-          .toPromise()
-          .then((response) => {
-            this.deptBudgetList = response
-            if(this.deptBudgetList.personPhone){
-              this.deptBudgetList.personPhone=this.deptBudgetList.personPhone.split(',')
-            }
-            
-            if (this.deptBudgetList.deliverType == 1) {
-              this.deptBudgetList.deliverType1 = '我方自提'
-            } else if (this.deptBudgetList.deliverType == 2) {
-              this.deptBudgetList.deliverType1 = '对方送货'
-            }
-          })
-          }
-          
-        }
-      },
-      cancelcopy(){
-        this.contractNo=''
-        this.deptBudgetList={
-          deliverType: '1',
-          sourceGoods:'',
-          placeDelivery:'',
-          agreementType: '采购合同',
-          addressUrl: '',
-          sellerPhone:'',
-          personPhone:'',
-          personCharge:'',
-          personChargeKey:'',
-          finalTradingVolume: 0,
-          totalContractPrice: 0,
-          contractGoodsInfo: {
-            goodsName: '',
-          },
-          contractProcessInfo: {},
-          settlementWeightMethod: '1',
-        }
-      },
       feedbackLeaderChange(e){
          this.deptBudgetList.feedbackLeaderPhone = ""
         for(var num = 0 ; num < e.length ; num++){
@@ -817,15 +758,6 @@ import { isUndefined } from 'xe-utils/methods'
         })
       },
       loaddata() {
-        // 合同编号
-        xialaNo({
-            compId: localStorage.getItem('ws-pf_compId'),
-            flag: 0,
-          })
-          .toPromise()
-          .then((response) => {
-            this.outContractNo = response
-          })
         // 包装方式
         packList({
             constId: 'CON1'
@@ -1789,7 +1721,7 @@ import { isUndefined } from 'xe-utils/methods'
     border-color: #5878e8;
   }
 
-  .bg {
+  .el-col {
     background: #f6f7fc;
   }
 

src/views/contractManagement/salesContract.vue

@@ -161,15 +161,8 @@
           <!-- <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i> -->
         </template>
       </el-table-column>
-      <el-table-column prop="address" label="操作" width="160">
+      <el-table-column prop="address" label="操作" width="140">
         <template slot-scope="scope">
-          <img width="16" height="17" style="
-                vertical-align: text-top;
-                position: relative;
-                top: -1px;
-                margin: 0 6px;
-              "  src="../../../public/img/daichu.png"
-             @click="handlecost(scope.row)" alt="" />
           <img width="16" height="16" style="vertical-align: text-top; margin: 0 6px"
             src="../../../public/img/chakan.png" @click="handleExamine(scope.row)" v-hasPermission="
               `contractManagement.salesContract.salesContractInfo.view`
@@ -196,7 +189,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <el-pagination :page-sizes="[10, 30, 50, 100, 500, 1000, 9999]" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+    <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>
     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
@@ -368,18 +361,6 @@
       this.showType = this.isShow
     },
     methods: {
-      
-      handlecost(row){
-         this.$router.push({
-          name: 'salesContractcost',
-          query: {
-            id: row.id,
-            contractNo: row.contractNo,
-            status:row.status,
-            buger:row.buger
-          },
-        })
-      },
       selectstatuschange(e,row){
         var data={}
         if(e=='发运结束'){

src/views/contractManagement/salesContractAdd.vue

@@ -2,9 +2,9 @@
   <div class="container">
     <el-row>
       <el-col :span="12">
-        <h2 class="bg-left title bg">创建销售合同</h2>
+        <h2 class="bg-left title">创建销售合同</h2>
       </el-col>
-      <el-col :span="12" class="bg-right bg">
+      <el-col :span="12" class="bg-right">
         <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()"><img width="6" height="10"
             style="vertion-align: bottom; margin-right: 3px" src="../../../public/img/lujing.png" alt="" />返回
         </el-button>
@@ -14,22 +14,10 @@
       <ws-form ref="deptBudgetList" :model="deptBudgetList">
         <div class="remark">
           <h3>基本信息</h3>
-           <el-row>
-      <el-col :span="12">
-        <p style="color: #8890b1">
-          注：基本信息和货物信息均为必填项，“<span style="color:red">*</span>” 标记的条目提交后不可修改。
-        </p>
-        </el-col>
-      <el-col :span="12" style='text-align:right;'>
-        <el-select v-model="contractNo" placeholder="请选择要复制的合同" class="typeselect" filterable clearable
-              @change="copySelect">
-              <el-option v-for="(item,index) in outContractNo" :key="'hetong'+index" :label="item.contractNo"
-                :value="item.contractNo" />
-            </el-select>
-            <el-button class="bg-bottom" type="primary" size="small" @click="cancelcopy()">取消复制
-        </el-button>
-         </el-col>
-    </el-row>
+          <p style="color: #8890b1">
+            &nbsp;&nbsp;注：基本信息均为必填项，“<span style="color:red">*</span>”
+            标记的条目提交后不可修改。
+          </p>
         </div>
         <!--基本信息-->
         <ws-info-table>
@@ -397,11 +385,10 @@
     editxiala,
     delxiala,
     getRelationContractNo,
-     getcustomerinfo,
-     examineList,
+     getcustomerinfo
   } from '@/model/contarct/index'
-  import {
-    getstaff,xialaNo,
+   import {
+    getstaff,
   } from '@/model/warehouse/index'
   import WsUpload from '@/components/WsUpload'
   import {
@@ -434,7 +421,6 @@
         customerinfo:[],
         //弹出框
         dialogViewSpareMoney: false,
-        contractNo:'',
         dialogApproveFormVisible: false,
         // 船舶类型
         monetaryKey: null,
@@ -468,7 +454,6 @@
         goodnameList: [],
         gradeList: [],
         ChapterTwoList: [],
-        outContractNo:[],
         deptBudgetList: {
           deliverType: '1',
           agreementType: '销售合同',
@@ -539,47 +524,6 @@
       if (!this.restaurants4) this.restaurants4 = [];
     },
     methods: {
-      copySelect(e){
-        for (let i = 0; i < this.outContractNo.length; i++) {
-          if(this.outContractNo[i].contractNo==e){
-            examineList({
-            id: this.outContractNo[i].id
-          })
-          .toPromise()
-          .then((response) => {
-            this.deptBudgetList = response
-            if(this.deptBudgetList.personPhone){
-              this.deptBudgetList.personPhone=this.deptBudgetList.personPhone.split(',')
-            }
-            
-            if (this.deptBudgetList.deliverType == 1) {
-              this.deptBudgetList.deliverType1 = '我方自提'
-            } else if (this.deptBudgetList.deliverType == 2) {
-              this.deptBudgetList.deliverType1 = '对方送货'
-            }
-          })
-          }
-          
-        }
-      },
-      cancelcopy(){
-        this.contractNo=''
-        this.deptBudgetList={
-          deliverType: '1',
-          agreementType: '销售合同',
-          finalTradingVolume: 0,
-          totalContractPrice: 0,
-          contractGoodsInfo: {
-            goodsName: '',
-          },
-          buyerPhone:'',
-          contractProcessInfo: {},
-          addressUrl: '',
-          sourceGoods: '',
-          placeDelivery: '',
-          settlementWeightMethod: '1',
-        }
-      },
       feedbackLeaderChange(e){
         this.deptBudgetList.feedbackLeader = this.feedbackLeaders[e].staffName
         this.deptBudgetList.feedbackLeaderPhone = this.feedbackLeaders[e].staffMobilePhone
@@ -688,14 +632,6 @@
         })
       },
       loaddata() {
-        xialaNo({
-            compId: localStorage.getItem('ws-pf_compId'),
-            flag: 1,
-          })
-          .toPromise()
-          .then((response) => {
-            this.outContractNo = response
-          })
         // 包装方式
         packList({
             constId: 'CON1',
@@ -1680,7 +1616,7 @@
     margin-top: 10px;
   }
 
-  .bg {
+  .el-col {
     background: #f6f7fc;
   }
 

src/views/houseSelfCollect/paymentManagement.vue

@@ -85,7 +85,7 @@
           :on-change="importClick" :show-file-list="false"
           accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
           :auto-upload="false">
-          <el-button type="primary">导入</el-button>
+          <ws-button type="primary">导入</ws-button>
         </el-upload>
       </template>
       <template slot="right"> </template>
@@ -514,7 +514,7 @@
         var reader = new FileReader();
         //if (!FileReader.prototype.readAsBinaryString) {
         FileReader.prototype.readAsBinaryString = function(f) {
-          var binary = "";
+          var binary = '';
           var rABS = false; //是否将文件读取为二进制字符串
           var pt = this;
           var wb; //读取完成的数据
@@ -556,7 +556,8 @@
               obj.tare = v.皮重
               obj.netWeight = v.净重
               obj.dryGrainPrice = v.单价
-              obj.qualityDate = v.日期
+              obj.qualityDate = _this.formatDate(v.日期,'-')
+              debugger
               _this.excelFreightspace.push(obj)
             })
             if (_this.excelFreightspace) {
@@ -586,6 +587,15 @@
         }
 
       },
+      formatDate(numb, format) {
+        const old = numb - 1;
+        const t = Math.round((old - Math.floor(old)) * 24 * 60 * 60);
+        const time = new Date(1900, 0, old, 0, 0, t)
+        const year = time.getFullYear() ;
+        const month = time.getMonth() + 1 ;
+        const date = time.getDate() ;
+        return year + format + (month < 10 ? '0' + month : month) + format + (date < 10 ? '0' + date : date)+' 00:00:00'
+      },
       invoicingClose() {
         this.invoicingshow = false
       },
@@ -773,12 +783,16 @@
             if (response.length > 0) {
               var arr = []
               for (let i = 0; i < response.length; i++) {
+                let _name = response[i].replace('https://taohaoliang.oss-cn-beijing.aliyuncs.com/FP/',"")
                 arr.push({
                   fileUrl: response[i],
-                  renameFileName: '发票' + i + '.xml',
+                  renameFileName: _name,
                 })
               }
               this.filesToRar(arr, '开票XML文件')
+            }else{
+               this.$message.error('暂无数据')
+               return
             }
           })
           .catch(() => {})

src/views/houseSelfCollect/weighingManagement.vue

@@ -107,7 +107,7 @@
             v-if=" (scope.row.status == '已称毛重' || scope.row.status == '已称皮重') "
             v-hasPermission="`acquisitionManagement.acquisitionWeight.weight`">皮重</el-button>
           <div style="display: inline-block;">
-            <el-button @click="del(scope.row)" type="danger"
+            <el-button :disabled="scope.row.allow == 2" @click="del(scope.row)" type="danger"
               v-hasPermission="`acquisitionManagement.acquisitionQuality.delete`">删除</el-button>
           </div>
           <el-button @click="print(scope.row)" v-if="scope.row.status == '已称皮重' ||scope.row.status == '已称毛重'"

src/views/tranManagement/tranManagementVehicle.vue

@@ -27,7 +27,6 @@
               left: -8px;
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
       </template>
-      
     </BaseHeaderLayout>
       <el-table class="wenzi" :data="warehouseList.records" style="width: 100%" height="calc(100% - 110px)">
         <el-table-column prop="warehouseName" label="序号" width="80">

src/views/warehouse/warehouseManagementGross.vue

@@ -251,7 +251,7 @@
                   deptBudgetList.outType == '汽运' ||
                   deptBudgetList.outType == '集装箱船'
                 ">
-                <ws-input v-if="options2.length == 0 && deptBudgetList.inOutType != '移库入库'" v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7"
+                <ws-input v-if="(options2.length == 0 && deptBudgetList.inOutType != '移库入库')" v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7"
                   size="small" />
                 <el-select v-if="carstatus && options2.length == 0&&deptBudgetList.inOutType=='移库入库'" filterable clearable :filter-method="dataFilter2"
                   v-model="deptBudgetList.carNo" placeholder="请选择车牌号" class="typeselect" @change="carChange">