前端

src/api/V2/statisticalReport/index.js

@@ -112,4 +112,6 @@ export const API_POST_EDIT_TRANSETTLEMENT ='/tranSettlementReport/api/editTranSe
 // 汽运导出
 export const API_GET_EXPORT = `/tranSettlementReport/export`
 // 批量清空
-export const API_POST_EMPTY = `/tranSettlementReport/api/batchEmptying`
+export const API_POST_EMPTY = `/tranSettlementReport/api/batchEmptying`
+// 合同详情
+export const API_POST_CONTRACT = `/stockSaleReceiptReport/selectContractDetail`

src/model/statisticalReport/index.js

@@ -53,7 +53,8 @@ import {
     API_POST_EDITTRANTASK,
     API_POST_EDIT_TRANSETTLEMENT,
     API_GET_EXPORT,
-    API_POST_EMPTY
+    API_POST_EMPTY,
+    API_POST_CONTRACT
 } from '@/api/V2/statisticalReport'
 //期货采购入库报表
 export const getpurchreceipt = appRx.get(API_GET_PURCHRECEIPT, errorCatcher, errorHandle, filter)
@@ -172,3 +173,5 @@ export const editgrainprice = appRx.post(API_POST_EDIT_TRANSETTLEMENT, errorCatc
 export const getexport = appRx.post(API_GET_EXPORT)
 // 批量清空flag1清空服务费 flag2清空税点
 export const batchempty = appRx.post(API_POST_EMPTY, errorCatcher, errorHandle, filter)
+// 合同详情
+export const getcontract = appRx.get(API_POST_CONTRACT, errorCatcher, errorHandle, filter)

src/views/profitable/cashout.vue

@@ -75,9 +75,13 @@
                 style="color: #8890b1" />
             </el-select>
           </el-form-item>
-          <el-form-item label-width='100px' label="费用名称" span="1" prop="settlementMethod">
-            <el-input class='input50 input_css' placeholder="输入费用名称，1-15个字"
+          <el-form-item  label-width='100px' label="费用名称" span="1" prop="settlementMethod">
+            <el-input v-if='deptBudgetList.purpose == "库点费用"&&deptBudgetList.type!="非粮款"' class='input50 input_css' placeholder="输入费用名称，1-15个字"
               v-model="deptBudgetList.expenseName"></el-input>
+            <el-select v-else v-model="deptBudgetList.expenseName" filterable placeholder="选择费用名称" class="typeselect">
+              <el-option v-for="item in expenseNameList" :key="item.value" :label="item.vlaue" :value="item.value"
+                style="color: #8890b1" />
+            </el-select>
           </el-form-item>
           <el-form-item label-width='100px' label="付款方名头" span="1" prop="payerHeader" class="readonly">
             <el-input class='input50 input_css' placeholder="输入付款方名头" v-model="deptBudgetList.payerHeader"></el-input>
@@ -268,6 +272,13 @@ export default {
       selected:false,
       lixiSelected:true,
       customerList: [],
+      expenseNameList:[{value:'仓储费',},{value:'超期保管费',},
+      {value:'堆天堆存费',},{value:'保险费',},{value:'利息费',},{value:'滞纳金',}
+      ,{value:'违约金',},{value:'报港费',},{value:'港杂费',},{value:'袋装费',},
+      {value:'平仓费',},{value:'装卸费',},{value:'出库费',},{value:'入库费',},
+      {value:'通风笼费',},{value:'煤款',},{value:'电费',},{value:'水电费',},
+      {value:'移库费',},{value:'汽运费',},{value:'火运费',},{value:'海运费',},
+      {value:'平仓费',},{value:'贴水费',}],
       goodsSource: '',
       value2: '',
       endDate: '',

src/views/profitable/cashoutedit.vue

@@ -49,7 +49,12 @@
             </el-select>
           </el-form-item>
           <el-form-item label-width='100px' label="费用名称" span="1" prop="settlementMethod">
-            <el-input class='input50 input_css' placeholder="输入费用名称，1-15个字" v-model="deptBudgetList.expenseName"></el-input>
+            <el-input v-if='deptBudgetList.purpose == "库点费用"&&deptBudgetList.type!="非粮款"' class='input50 input_css' placeholder="输入费用名称，1-15个字"
+              v-model="deptBudgetList.expenseName"></el-input>
+            <el-select v-else v-model="deptBudgetList.expenseName" filterable placeholder="选择费用名称" class="typeselect">
+              <el-option v-for="item in expenseNameList" :key="item.value" :label="item.vlaue" :value="item.value"
+                style="color: #8890b1" />
+            </el-select>
           </el-form-item>
           <el-form-item label-width='100px' v-if='deptBudgetList.expensesType=="2"' label="付款方名头" span="1" prop="payerHeader" class="readonly">
             <el-input class='input50 input_css' placeholder="输入付款方名头" v-model="deptBudgetList.payerHeader"></el-input>
@@ -168,6 +173,13 @@
         selected:false,
         lixiSelected:true,
         value: [],
+        expenseNameList:[{value:'仓储费',},{value:'超期保管费',},
+      {value:'堆天堆存费',},{value:'保险费',},{value:'利息费',},{value:'滞纳金',}
+      ,{value:'违约金',},{value:'报港费',},{value:'港杂费',},{value:'袋装费',},
+      {value:'平仓费',},{value:'装卸费',},{value:'出库费',},{value:'入库费',},
+      {value:'通风笼费',},{value:'煤款',},{value:'电费',},{value:'水电费',},
+      {value:'移库费',},{value:'汽运费',},{value:'火运费',},{value:'海运费',},
+      {value:'平仓费',},{value:'贴水费',}],
         profitList: [{
           name: '玉米',
           count: 2000,

src/views/profitable/receipt.vue

@@ -44,7 +44,12 @@
             </el-select>
           </el-form-item>
           <el-form-item label-width='100px' label="费用名称" span="1" prop="settlementMethod">
-            <el-input placeholder="输入费用名称，1-15个字" class="input_css input50" v-model="deptBudgetList.expenseName"></el-input>
+            <el-input v-if='deptBudgetList.purpose == "库点费用"&&deptBudgetList.type!="非粮款"' class='input50 input_css' placeholder="输入费用名称，1-15个字"
+              v-model="deptBudgetList.expenseName"></el-input>
+            <el-select v-else v-model="deptBudgetList.expenseName" filterable placeholder="选择费用名称" class="typeselect">
+              <el-option v-for="item in expenseNameList" :key="item.value" :label="item.vlaue" :value="item.value"
+                style="color: #8890b1" />
+            </el-select>
           </el-form-item>
           <el-form-item label-width='100px' label="金额" span="1" prop="contractNo" class="readonly">
             <el-input placeholder="输入收款金额" class="input_css input50" v-model="deptBudgetList.amountMoney"></el-input>
@@ -85,6 +90,13 @@
           name: '玉米',
           count: 2000,
         }],
+        expenseNameList:[{value:'仓储费',},{value:'超期保管费',},
+      {value:'堆天堆存费',},{value:'保险费',},{value:'利息费',},{value:'滞纳金',}
+      ,{value:'违约金',},{value:'报港费',},{value:'港杂费',},{value:'袋装费',},
+      {value:'平仓费',},{value:'装卸费',},{value:'出库费',},{value:'入库费',},
+      {value:'通风笼费',},{value:'煤款',},{value:'电费',},{value:'水电费',},
+      {value:'移库费',},{value:'汽运费',},{value:'火运费',},{value:'海运费',},
+      {value:'平仓费',},{value:'贴水费',}],
         mode:'全部分配',
         ware:'指定仓库',
         dates:'固定日期',

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -223,6 +223,7 @@
     editSettlementWeight,
     addDisOrRemarks,
     stockPurchasePayMoney,
+    getcontract
   } from '@/model/statisticalReport/index'
   import {workflowcontent} from '@/model/houseSelfCollect/index'
   import {downloadFile} from '@/utils/batchDown'
@@ -769,12 +770,13 @@
         this.searchType = status
         this.getList()
       },
-      contractchange(e) {
+      async contractchange(e) {
         for (var i = 0; i < this.contractNoList.length; i++) {
           if (this.contractNoList[i].contractNo == e) {
-            this.orderList = this.contractNoList[i]
-            if (this.contractNoList[i].depositUrl) {
-              this.addressUrlArray = this.contractNoList[i].depositUrl.split(',')
+            var data=await getcontract({contractId:this.contractNoList[i].id}).toPromise()
+            this.orderList = data
+            if (data.depositUrl) {
+              this.addressUrlArray = data.depositUrl.split(',')
             } else {
               this.addressUrlArray = []
             }

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -459,7 +459,8 @@
     disOrRemarks,
     saleEditSettlementWeight,
     editSettlementWeightStock,
-    editinvoice
+    editinvoice,
+    getcontract
   } from '@/model/statisticalReport/index'
   import Pagination from '@/components/Pagination'
   import WsUpload from '@/components/WsUpload'
@@ -714,7 +715,7 @@
         this.getList(this.orderList.deliverType)
       },
       //表头
-      contractchange(e) {
+      async contractchange(e) {
         this.currentPage = 1
         this.pageSize = 10
         this.tranProcessInfo = []
@@ -722,7 +723,8 @@
         console.log('type', this.activeName)
         for (var i = 0; i < this.contractNoList.length; i++) {
           if (this.contractNoList[i].contractNo == e) {
-            this.orderList = this.contractNoList[i]
+            var data=await getcontract({contractId:this.contractNoList[i].id}).toPromise()
+            this.orderList = data
             if (this.orderList.tranTaskInfoList) {
               for (let i = 0; i < this.orderList.tranTaskInfoList.length; i++) {
                 if (this.orderList.tranTaskInfoList[i].tranProcessInfo) {
@@ -739,9 +741,8 @@
                 this.tranType = this.tranProcessInfo[0].tranType
               }
             }
-            console.log(this.tranProcessInfo)
-            if (this.contractNoList[i].depositUrl) {
-              this.addressUrlArray = this.contractNoList[i].depositUrl.split(',')
+            if (data.depositUrl) {
+              this.addressUrlArray = data.depositUrl.split(',')
             } else {
               this.addressUrlArray = []
             }

src/views/universalityAudit/audit.vue

@@ -161,7 +161,9 @@
     </el-dialog>
     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose">
-      <ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :batch-down="true" :editable="false"
+      <ws-upload v-if='!form1.approveStatus' ref="upload1" limit="20" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx"
+            :comp-id="compId" :appendix-ids="form1.addressUrl" :size-limit="size" @onChange="onChange1" />
+          <ws-upload v-else ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
     </WinseaContentModal>
     <el-dialog width="50%" :visible.sync="dialogVisible1" title="审核记录">
@@ -235,6 +237,7 @@ export default {
       accessoryTFs: false,
       appendixIdss: '',
       blocks: [],
+      form1:{},
       compId: localStorage.getItem('ws-pf_compId'),
       currectdata: {},
       dialogVisible1: false,
@@ -259,6 +262,7 @@ export default {
         .handleSaveBill()
         .then(async response => {
           this.auditList = response
+          
           // this.deptBudgetList.addressUrl = response
         })
         .catch(res => {
@@ -274,6 +278,7 @@ export default {
         this.auditUrl = this.auditUrl + "," + data.appendixPath
       }
     },
+  
     rejectclick() {
       if (this.title == '驳回') {
         woekflowhandle({
@@ -435,6 +440,8 @@ export default {
       })
     },
     fujian(row) {
+      this.form1=row
+      console.log(this.f)
       this.id = row.id
       this.accessoryTFs = true
       this.appendixIdss = row.addressUrl
@@ -474,7 +481,25 @@ export default {
           this.$refs.upload.clearFiles()
         })
     },
-
+    onChange1() {
+      this.$refs.upload1
+        .handleSaveBill()
+        .then(async (response) => {
+          this.form1.addressUrl = response
+          editaduitinfo(this.form1).toPromise().then(response => {
+              this.$message({
+                message: '修改成功!',
+                type: 'success',
+              })
+              this.accessoryTFs = false
+              this.getList()
+            })
+        })
+        .catch((res) => {
+          EventBus.$emit('error', (JSON.parse(res) || {}).message)
+          this.$refs.upload1.clearFiles()
+        })
+    },
     onSubmit() {
       if (!this.form.businessType) {
         this.$message({

src/views/warehousenew/warehouseManagementList.vue

@@ -88,7 +88,7 @@
       <ws-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.edit` " @click="handleEdit()">编辑</ws-button>
       <ws-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.delete`" @click="handleDelete()">删除</ws-button>
       <ws-button v-hasPermission=" `warehouseManagement.warehouse.warehouseInfo.view`" @click="record()">记录</ws-button>
-      <ws-button v-if="warehouseType == '1'" v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.view`" @click="loss()">盘库</ws-button>
+      <!-- <ws-button v-if="warehouseType == '1'" v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.view`" @click="loss()">盘库</ws-button> -->
       <ws-button v-if="warehouseInfo.clearStatusFlag == 1 && warehouseType == '2'" @click="clearance()">清库</ws-button>
       <ws-button v-if="warehouseInfo.clearStatusFlag == 3 && warehouseType == '2'" disabled> 已清库</ws-button>
       <!-- createType 1手动创建 2 自动创建 -->