Переглянути джерело

OW 拿 加付费申请 新加同步附件功能 调整发票申请布局

Qukatie 4 місяців тому
батько
коміт
8d262d3789

+ 8 - 0
src/api/uploadFile/upload-file.js

@@ -19,3 +19,11 @@ export function submitList(data) {
     data:data
   })
 }
+//附件上传列表删除
+export function synchronousFiles(data) {
+  return request({
+    url: '/api/blade-los/fininvoices/synchronousFiles',
+    method: 'post',
+    data:data
+  })
+}

+ 33 - 5
src/components/upload/index.vue

@@ -1,14 +1,15 @@
 <template>
   <div>
     <basic-container v-if="!basic">
-      <avue-crud :data="data" ref="crud" :option="option" :key="key" @resetColumn="resetColumn"
-        @saveColumn="saveColumn">
+      <avue-crud :data="data" ref="crud" :option="option" :key="key" @resetColumn="resetColumn" @saveColumn="saveColumn"
+        @selection-change="selectionChange">
         <template slot="menuLeft">
           <el-button type="primary" size="small" icon="el-icon-edit" @click="addDetail" :disabled="disabled"
             v-if="display">上传
           </el-button>
-          <el-button type="success" size="small" @click="submit" :disabled="disabled"
-            v-if="saveBtn">一键保存
+          <el-button type="success" size="small" @click="submit" :disabled="disabled" v-if="saveBtn">一键保存
+          </el-button>
+          <el-button type="success" size="small" @click="synchronous" :disabled="disabled" v-if="sysBtn">同步附件
           </el-button>
           <slot name="c_button"></slot>
         </template>
@@ -144,7 +145,7 @@ import { getToken } from "@/util/auth";
 import { LTfujianDelete, sharedDeletion } from "@/api/user";
 import option from "@/views/exportTrade/customerInquiry/config/mainList.json";
 import { gainUser } from "@/api/basicData/customerInquiry";
-import { updateListRemove, submitList } from "@/api/uploadFile/upload-file";
+import { updateListRemove, submitList, synchronousFiles } from "@/api/uploadFile/upload-file";
 import { deleteImg } from "../../api/basicData/EquipmentArchives";
 import PreviewImage from '@/components/PreviewImage/index.vue'
 export default {
@@ -189,6 +190,10 @@ export default {
       type: Boolean,
       default: false
     },
+    sysBtn: {
+      type: Boolean,
+      default: false
+    },
     pId: {
       type: String,
       default: null
@@ -196,6 +201,7 @@ export default {
   },
   data() {
     return {
+      selectionList: [],
       excelBox: false,
       excelTwo: false,
       innerVisible: false,
@@ -215,6 +221,8 @@ export default {
         editBtn: false,
         addBtn: false,
         align: "center",
+        tip:false,
+        selection: true,
         column: [
           {
             label: "文件名称",
@@ -459,6 +467,9 @@ export default {
     this.key++
   },
   methods: {
+    selectionChange(list) {
+      this.selectionList = list
+    },
     //自定义列保存
     async saveColumn() {
       /**
@@ -545,6 +556,23 @@ export default {
         loading.close();
       })
     },
+    synchronous() {
+      let obj = {
+        id: this.pId,
+        fileList: this.selectionList
+      }
+      const loading = this.$loading({
+        lock: true,
+        text: '加载中',
+        spinner: 'el-icon-loading',
+        background: 'rgba(255,255,255,0.7)'
+      });
+      synchronousFiles(obj).then(res => {
+        this.$message.success("操作成功");
+      }).finally(() => {
+        loading.close();
+      })
+    },
     beforeUpload(file) {
       if (file.type == "image/jpeg" || file.type == "image/png" || file.type == "image/bmp") {
         const fileSize = file.size / 1024 / 1024

+ 2 - 2
src/views/boxManagement/podComeback/index.vue

@@ -11,9 +11,9 @@
           <el-button type="success" size="small" :disabled="selectionList.length == 0"
             @click="allClick('批量修改POD场站')">批量修改POD场站
           </el-button>
-          <el-button type="success" size="small" :disabled="selectionList.length == 0"
+          <!-- <el-button type="success" size="small" :disabled="selectionList.length == 0"
             @click="allClick('批量确认返场')">批量确认返场
-          </el-button>
+          </el-button> -->
           <el-button type="warning" size="small" @click="outExport">导 出
           </el-button>
         </template>

+ 1 - 2
src/views/iosBasicData/PaymentApplication/finstlbillsDetails.vue

@@ -554,8 +554,7 @@ export default {
         this.roleName = localStorage.getItem('roleName').split(',')
         // 获取当前登录人个人信息
         this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
-        if (this.$route.query.mblno) {
-            // console.log(111111)
+        if (this.$route.query.mblno||this.$route.query.corpId) {
             this.form.mblno = this.$route.query.mblno
             this.form.corpCnName = this.$route.query.corpCnName
             this.form.corpId = this.$route.query.corpId

+ 1 - 1
src/views/iosBasicData/PaymentApplication/index.vue

@@ -467,7 +467,7 @@ export default {
         }
       }, 200);
     }
-    if (this.$route.query.mblno) {
+    if (this.$route.query.mblno||this.$route.query.corpId) {
       setTimeout(() => {
         if (!this.$store.getters.payAppStatus) {
           this.newbillFun()

+ 23 - 28
src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -98,30 +98,6 @@
                                                 </el-form-item>
                                             </el-col>
                                             <el-col :span="12">
-                                                <el-form-item label="税号" prop="invCorpTaxNo">
-                                                    <el-input style="width: 100%;" v-model="form.invCorpTaxNo"
-                                                        size="small" autocomplete="off" :disabled="true" clearable
-                                                        placeholder="请输入税号">
-                                                    </el-input>
-                                                </el-form-item>
-                                            </el-col>
-                                            <el-col :span="12">
-                                                <el-form-item label="美元银行" prop="invCorpAccountBankUsd">
-                                                    <el-input style="width: 100%;" v-model="form.invCorpAccountBankUsd"
-                                                        size="small" autocomplete="off" :disabled="true" clearable
-                                                        placeholder="请输入美元银行">
-                                                    </el-input>
-                                                </el-form-item>
-                                            </el-col>
-                                            <el-col :span="12">
-                                                <el-form-item label="美元账户" prop="invCorpAccountNoUsd">
-                                                    <el-input style="width: 100%;" v-model="form.invCorpAccountNoUsd"
-                                                        size="small" autocomplete="off" :disabled="true" clearable
-                                                        placeholder="请输入美元账户">
-                                                    </el-input>
-                                                </el-form-item>
-                                            </el-col>
-                                            <el-col :span="12">
                                                 <el-form-item label="开票币种" prop="invCurCode">
                                                     <search-query :datalist="invCurCodeData"
                                                         :selectValue="form.invCurCode" :filterable="true"
@@ -134,10 +110,21 @@
                                                 </el-form-item>
                                             </el-col>
                                             <el-col :span="12">
-                                                <el-form-item label="分单号" prop="hblno">
-                                                    <el-input style="width: 100%;" v-model="form.hblno" size="small"
+                                                <el-form-item label="船名" prop="vesselCnName">
+                                                    <dic-select v-model="form.vesselCnName" placeholder="船名" key="id"
+                                                        label="cnName" res="records"
+                                                        :disabled="editSave || tableData.length"
+                                                        url="/blade-los/bvessels/list?status=0&current=1&size=5"
+                                                        :filterable="true" :remote="true" dataName="cnName"
+                                                        @selectChange="dicChange('vesselCnName', $event)"
+                                                        :slotRight="true" rightLabel="code"></dic-select>
+                                                </el-form-item>
+                                            </el-col>
+                                            <el-col :span="12">
+                                                <el-form-item label="航次" prop="voyageNo">
+                                                    <el-input style="width: 100%;" v-model="form.voyageNo" size="small"
                                                         autocomplete="off" :disabled="editSave || tableData.length"
-                                                        clearable placeholder="请输入分单号">
+                                                        clearable placeholder="请输入航次">
                                                     </el-input>
                                                 </el-form-item>
                                             </el-col>
@@ -761,7 +748,7 @@ export default {
             this.form.curCode = this.getLocalCurrency()
             this.$set(this.form, 'exrate', this.getExchangeRate(this.getLocalCurrency(), this.form.dc ? this.form.dc : 'D', 2))
         }
-        if (this.$route.query.mblno||this.$route.query.corpId) {
+        if (this.$route.query.mblno || this.$route.query.corpId) {
             // console.log(111111)
             this.form.mblno = this.$route.query.mblno
             this.form.corpCnName = this.$route.query.corpCnName
@@ -782,6 +769,14 @@ export default {
                     this.form.branchName = null
                 }
             }
+            if (name == 'vesselCnName') {
+                this.form.vesselId = row.id
+                this.form.vesselEnName = row.enName
+            } else {
+                this.form.vesselId = null
+                this.form.vesselEnName = null
+                this.form.vesselCnName = null
+            }
         },
         ResetFilter() {
             this.form = {

+ 1 - 1
src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -561,7 +561,7 @@
                 <el-tab-pane label="文件中心">
                     <containerTitle title="上传附件"></containerTitle>
                     <c-upload :data="form.fileList" :enumerationValue="76" deleteUrl="/api/blade-los/filescenter/remove"
-                        display :pId="form.id" @upDate="upDate" :saveBtn="true"></c-upload>
+                        display :pId="form.id" @upDate="upDate" :saveBtn="true" :sysBtn="true"></c-upload>
                 </el-tab-pane>
             </el-tabs>
         </div>

+ 47 - 2
src/views/ow/owTask/detailsPage.vue

@@ -339,8 +339,8 @@
                   :disabled="form.tradingBoxItemsList.length == 0">生成箱使费</el-button>
                 <el-button type="danger" plain size="small" @click="allClick('撤销箱使费')"
                   :disabled="form.tradingBoxItemsList.length == 0">撤销箱使费</el-button>
-                <el-button type="primary" plain size="small" :disabled="selectionfeedList.length == 0"
-                  @click="allClick('C发票申请')">发票申请</el-button>
+                <el-button type="primary" plain size="small" :disabled="selectionfeecList.length == 0"
+                  @click="allClick('C付费申请')">付费申请</el-button>
                 <el-button type="primary" plain size="small" :disabled="selectionfeedList.length"
                   @click="allClick('C费用申请')">请核费用</el-button>
                 <el-button type="danger" plain size="small" :disabled="disabled || selectionfeecList.length == 0"
@@ -3122,6 +3122,51 @@ export default {
           })
         });
       }
+      if (name == 'D发票申请') {
+        if (this.selectionfeedList.length == 0) return this.$message.error("请选择费用");
+        if (this.selectionfeedList.length != this.selectionfeedList.filter(e => e.corpCnName == this.selectionfeedList[0].corpCnName).length) return this.$message.error("请选择相同的结算单位");
+        if (this.selectionfeedList.filter(e => e.auditStatus != 4).length) return this.$message.error("请选择审核通过的费用");
+        if (this.$store.getters.finappStatus) {
+          this.$alert("发票申请(F)页面已存在,请关闭发票申请(F)再进行操作", "温馨提示", {
+            confirmButtonText: "确定",
+            type: 'warning',
+            callback: action => {
+            }
+          });
+        } else {
+          this.$router.push({
+            path: `/iosBasicData/fininvoicesApplyfor/index`,
+            query: {
+              // mblno: this.form.mblno,
+              corpCnName: this.selectionfeedList[0].corpCnName,
+              corpId: this.selectionfeedList[0].corpId
+            }
+          })
+        }
+
+      }
+      if (name == 'C付费申请') {
+        if (this.selectionfeecList.length == 0) return this.$message.error("请选择费用");
+        if (this.selectionfeecList.filter(e => e.auditStatus != 4).length) return this.$message.error("请选择审核通过的费用");
+        if (this.selectionfeecList.length != this.selectionfeecList.filter(e => e.corpCnName == this.selectionfeecList[0].corpCnName).length) return this.$message.error("请选择相同的结算单位");
+        if (this.$store.getters.payAppStatus) {
+          this.$alert("付费申请页面已存在,请关闭付费申请再进行操作", "温馨提示", {
+            confirmButtonText: "确定",
+            type: 'warning',
+            callback: action => {
+            }
+          });
+        } else {
+          this.$router.push({
+            path: `/iosBasicData/PaymentApplication/index`,
+            query: {
+              mblno: this.form.mblno,
+              corpCnName: this.selectionfeecList[0].corpCnName,
+              corpId: this.selectionfeecList[0].corpId
+            }
+          })
+        }
+      }
       if (name == 'C费用申请') {
         for (let row of this.selectionfeecList) {
           if (!row.id) {