进口 财务 审批 修改

src/api/approveData/main.js

@@ -20,13 +20,14 @@ export function approvePass(data) {
   })
 }
 
-export function batchOperation(id,operate) {
+export function batchOperation(id,operate,auditMsg) {
   return request({
     url: '/api/blade-check/auditproecess/batchOperation',
     method: 'post',
     params: {
       ids:id,
-      operate:operate
+      operate:operate,
+      auditMsg:auditMsg
     },
   })
 }

src/components/check/check.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script>
-  import { approvePass } from "@/api/approveData/main";
+  import { approvePass,batchOperation } from "@/api/approveData/main";
 
   export default {
     name: "check",
@@ -21,6 +21,12 @@
       },
       choceCheckFun:{
         type: Function
+      },
+      checkDetail:{
+        type: Boolean
+      },
+      idList:{
+        type: Array
       }
     },
     data() {
@@ -86,11 +92,33 @@
     },
     methods: {
       submit(operate){
-        this.checkData.operate =  operate
-        approvePass(this.checkData).then(res=>{
-          if(res.data.success){
-            this.$message.success("操作成功!")
-            this.$emit("choceCheckFun")
+        this.$confirm("是否确认此操作!", "提示", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          this.checkData.operate =  operate
+          if(this.idList.length !== 0){
+            //批量
+            console.log(this.form.auditMsg)
+            batchOperation(this.idList.join(","),operate,this.form.auditMsg).then(res=>{
+              if(res.data.success){
+                this.$message.success("操作成功!")
+                this.$emit("operationType")
+              }
+            })
+          }else{
+            //单个
+            approvePass(this.checkData).then(res=>{
+              if(res.data.success){
+                this.$message.success("操作成功!")
+                this.$emit("choceCheckFun")
+              }
+              if(!this.checkDetail){
+                this.$router.go(-1);
+                this.$router.push({path: "/approveData/index"})
+              }
+            })
           }
         })
       }

src/components/finance/applyPayment.vue

@@ -59,7 +59,7 @@
     </el-button>
     <div style="float: right;margin: 8px">
       <el-button size="small" @click="$emit('choceFun')">取消</el-button>
-      <el-button type="primary" size="small" @click="submit()">确定</el-button>
+      <el-button type="primary" size="small" :loading="submitButton" @click="submit()">确定</el-button>
     </div>
   </div>
 </template>
@@ -96,6 +96,8 @@ export default {
       list: [],
       currencyDic: [],
       corpId: "",
+      dateType:true,
+      submitButton:false,
       configuration: {
         multipleChoices: false,
         multiple: false,
@@ -171,7 +173,7 @@ export default {
             ]
           },
           {
-            label: this.billType === "收费"?'退款日期':this.billData.optionType === "JK" ? '合同日期' : "订单日期",
+            label:  this.dateType === true?"合同日期":"合同日期",
             type: "date",
             prop: 'accDate',
             span: 8,
@@ -296,6 +298,15 @@ export default {
     this.getWorkDicts("currency").then(res => {
       this.currencyDic = res.data.data
     })
+    // //             采购退费                                                       销售退费
+    // if((this.billData.itemType === "采购" && this.billType === "收费") ||  (this.billData.itemType === "销售" && this.billType === "申请")   ){
+    //   console.log(1)
+    //   this.dateType = false
+    //   let date = new Date();
+    //   let strDate = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
+    //   this.billData.accDate = strDate
+    // }
+    //单条生成
     if (this.arrList.length == 0) {
       this.form.form = this.billData
       if(this.billData.billNoList && this.billData.billNoList.length === 1){
@@ -305,6 +316,7 @@ export default {
       this.configuration.dicData = this.billData.corpsName
       this.addForm();
     }
+    //批量生成
     if (this.arrList.length > 0) {
       this.list = this.arrList
       this.corpId = this.list[0].form.corpId
@@ -347,6 +359,7 @@ export default {
       let result = [];
       await this.handleRulesValid(["form"], result)
       if (result.some(item => item)) {
+        this.submitButton = true
         const itemsList = this.list.map(item => {
           item.form.corpId = this.corpId;
           item.form.tradeType = this.billData.optionType
@@ -367,7 +380,7 @@ export default {
               this.$emit("choceFun");
               //跳转付款申请页面
               if(this.$store.getters.pqStatus){
-                this.$alert("无法自动跳转到付款申请页面,因为页面已存在。", "温馨提示", {
+                this.$alert("无法自动跳,因为付费申请页面已存在!", "温馨提示", {
                   confirmButtonText: "确定",
                   type: 'warning',
                   callback: action => {
@@ -382,6 +395,8 @@ export default {
                 });
               }
             }
+          }).finally(()=>{
+            this.submitButton = false
           })
         }
         //采购退款结算 销售收款结算  不需申请请核 直接结算  => 结算
@@ -391,6 +406,8 @@ export default {
               this.$message.success("操作成功!")
               this.$emit("choceFun");
             }
+          }).finally(()=>{
+            this.submitButton = false
           })
         }
       }

src/components/goodsSelect/index.vue

@@ -168,11 +168,7 @@ export default {
     },
     //刷新触发
     refreshChange() {
-      this.page = {
-        pageSize: 10,
-        pagerCount: 5,
-        total: 0,
-      }
+      this.onLoad(this.page)
     },
     //确认导出触发
     confirmSelection() {
@@ -189,16 +185,16 @@ export default {
         this.value = this.selection[0].cname
       }
       this.$emit('returnRow', this.selection)
-      this.selection = []
-      this.$emit('returnBack', this.value)
-      this.dialogVisible = false
-      this.$emit('receiveList',this.dicData)
       let valueName = {
-        id:this.dicData[0].id,
-        list:this.dicData[0].goodList.map(item=>{
+        id:this.selection[0].id,
+        list:this.selection[0].goodsSpecificationList.map(item=>{
           return item.cname
         })
       }
+      this.selection = []
+      this.$emit('returnBack', this.value)
+      this.dialogVisible = false
+      this.$emit('receiveList',this.dicData)
       this.$emit('valueName',valueName)
     },
     //选中触发

src/page/index/tags.vue

@@ -306,7 +306,7 @@ export default {
         if (tag.label == "收货单(I)") {
           this.$store.commit("TAKE_OUT_DETAIL");
         }
-        if (tag.label == "付款申请") {
+        if (tag.label == "付费申请") {
           this.$store.commit("PQ_OUT_DETAIL");
         }
         if (tag.label == "付款结算") {
@@ -315,7 +315,7 @@ export default {
         if (tag.label == "收款结算") {
           this.$store.commit("RECE_OUT_DETAIL");
         }
-        if (tag.label == "主营项目") {
+        if (tag.label == "结算") {
           this.$store.commit("MAIN_OUT_DETAIL");
         }
         this.$store.commit("DEL_TAG", tag);

src/router/views/index.js

@@ -506,14 +506,14 @@ export default [{
   },
   // 统计列表
   {
-    path: '/statistical_List',
+    path: '/workManagement/receipt/statisticalList',
     component: Layout,
     hidden: true,
     children: [
       {
-        path: '/statistical_List',
+        path: '/workManagement/receipt/statisticalList',
         meta: {
-          i18n: 'statistical_List'
+          keepAlive:true,
         },
         component: () => import( /* webpackChunkName: "views" */ '@/views/workManagement/receipt/statisticalList')
       }
@@ -543,7 +543,7 @@ export default [{
     children: [
       {
         path: '/financialManagement/paymentRequest/index',
-        name:"付款申请",
+        name:"付费申请",
         meta: {
           i18n: '/financialManagement/paymentRequest/index',
           keepAlive: true,
@@ -586,6 +586,23 @@ export default [{
       }
     ]
   },
+  //审批数据
+  {
+    path: '/approveData/index',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: '/approveData/index',
+        name:"审批数据",
+        meta: {
+          i18n: '/approveData/index',
+          keepAlive: true,
+        },
+        component: () => import( /* webpackChunkName: "views" */ '@/views/approveData/index')
+      }
+    ]
+  },
   // 账单明细
   {
     path: '/bill_details',

src/store/modules/ifdetail.js

@@ -68,11 +68,11 @@ const ifdetail = {
       state.outtaskStatus = false;
     },
     //付款管理
-    // 进入付款申请
+    // 进入付费申请
     PQ_IN_DETAIL(state) {
       state.pqStatus = true;
     },
-    // 退出付款申请
+    // 退出付费申请
     PQ_OUT_DETAIL(state) {
       state.pqStatus = false;
     },
@@ -129,7 +129,7 @@ const ifdetail = {
       if (tag.label == '收货(E)') {
         state.outtaskStatus = true;
       }
-      if (tag.label == '付款申请') {
+      if (tag.label == '付费申请') {
         state.pqStatus = true;
       }
       if (tag.label == '付款结算') {
@@ -138,7 +138,7 @@ const ifdetail = {
       if (tag.label == '收款结算') {
         state.receiptSettle = true;
       }
-      if (tag.label == '主营项目') {
+      if (tag.label == '结算') {
         state.mainItemStatus = true;
       }
     }

src/views/approveData/index.vue

@@ -64,6 +64,9 @@
     >
       <check
         :checkData="checkData"
+        :checkDetail="true"
+        :idList="idList"
+        @operationType="operationType"
         @choceCheckFun="choceCheckFun"
       >
       </check>
@@ -94,6 +97,7 @@
         parentId:0,
         checkData:{},
         dataList: [],
+        idList:[],
         selectionList:[],
         page: {
           pageSize: 10,
@@ -121,29 +125,20 @@
     },
     methods: {
       batchCheck(){
-        let idList = [];
         for(let i=0;i<this.selectionList.length;i++){
           if(this.selectionList[i].auditStatus != "S"){
             return this.$message.error("审核状态必须都为待审核状态!")
           }else{
-            idList.push(this.selectionList[i].id)
+            this.idList.push(this.selectionList[i].id)
           }
         }
-
-        this.$confirm('确定进行批量操作吗?', '提示', {
-          confirmButtonText: '审核通过',
-          cancelButtonText: '取消',
-          type: 'warning',
-          distinguishCancelAndClose : false
-        }).then(() => {
-          //批量通过
-          batchOperation(idList.join(","),"1").then(res=>{
-            if(res.data.success){
-              this.$message.success("操作成功!")
-              this.refreshChange();
-            }
-          })
-        })
+        //打开cheack
+        this.checkDialog = true;
+      },
+      operationType(){
+        this.checkDialog = false;
+        this.refreshChange()
+        this.idList = []
       },
       //跳转页面
       jumpPage(row){
@@ -167,6 +162,7 @@
         })
       },
       openCheck(row){
+        this.batch = false //单条操作
         this.checkDialog = true
         this.checkData = row
       },

src/views/financialManagement/paymentRequest/index.vue

@@ -98,6 +98,7 @@
       }
     },
     activated() {
+      this.show = true;
       setTimeout(() => {
         if(this.$route.query.check){
           this.detailData={

src/views/financialManagement/paymentRequest/paymentRequestDetails.vue

@@ -2,7 +2,7 @@
   <div class="borderless">
     <div class="customer-head">
       <div class="customer-back">
-        <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
+        <el-button v-if="!auditDisabled" type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
                    @click="backToList">返回列表
         </el-button>
         <div v-if="!auditDisabled" class="upper_right_button">
@@ -185,6 +185,8 @@
     >
       <check
         :checkData="checkData"
+        :checkDetail="false"
+        :idList="[]"
         @choceCheckFun="choceCheckFun"
       >
       </check>
@@ -519,7 +521,7 @@
       settlement(){
         if(this.verification()){
           if(this.$store.getters.takeStatus){
-            this.$alert("结算页面已存在,请关闭收货单再进行操作", "温馨提示", {
+            this.$alert("结算页面已存在,请关闭结算页面再进行操作", "温馨提示", {
               confirmButtonText: "确定",
               type: 'warning',
               callback: action => {

src/views/importTrade/invoice/index.vue

@@ -141,6 +141,7 @@ export default {
     // this.option.height = window.innerHeight - 200;
   },
   activated() {
+    this.show = true;
     setTimeout(() => {
       if(this.$route.query.form){
         this.detailData={

src/views/importTrade/receipt/detailsPageEdit.vue

@@ -56,9 +56,8 @@
                   style="width: 100%"
                 ></crop-select>
                 <el-select v-else-if="item.prop === 'storageId'" style="width: 100%" :disabled="receiptDisable || viewDisabled" v-model="form[item.prop]" size="small" placeholder="请选择" clearable filterable>
-                  <el-option v-for="(item,index) in storageIdDic" :key="index" :label="item.cname" :value="item.id"></el-option>
+                  <el-option v-for="(item,index) in storageIdDic" :key="index" :label="item.contactsData " :value="item.id"></el-option>
                 </el-select>
-<!--                <warehouse-select v-else-if="item.prop === 'storageId'" v-model="form[item.prop]" @change="warehouseChange" :configuration="configuration" />-->
                 <el-input type="textarea" v-else-if="(item.prop === 'deliveryRemarks')" v-model="form[item.prop]"  :disabled="receiptDisable || viewDisabled" size="small" autocomplete="off" placeholder="请输入"></el-input>
                 <el-input v-else v-model="form[item.prop]" size="small" :disabled="item.disabled?true:false || receiptDisable || viewDisabled" placeholder="请输入" autocomplete="off"></el-input>
               </el-form-item>
@@ -492,17 +491,7 @@ export default {
       this.buttonLoading = true;
       let id = this.detailData.id.replace(/\"/g, "")
       detailReceiptList(id).then(res => {
-        this.form = res.data.data;
-        this.oldForm = Object.assign({},res.data.data);
-        this.receiptDisable = res.data.data.deliveryStatus === "已收货" ?   true :false
-        if(this.form.deliveryItemsList){
-          this.contactsData = this.form.deliveryItemsList
-          this.oldContactsData = this.deepClone(this.form.deliveryItemsList)
-        }
-        if(this.form.deliveryFilesList){
-          this.upLoadData = this.form.deliveryFilesList
-          this.oldUpLoadData = this.deepClone(this.form.deliveryFilesList)
-        }
+        this.afterData(res.data.data)
       }).finally(()=>{
         this.buttonLoading = false;
       })
@@ -531,6 +520,7 @@ export default {
           //   BQ : _.divide(item.billWeight, item.orderQuantity),
           //   IQ : _.divide(item.invoiceWeight, item.orderQuantity)
           // }
+          console.log(item)
           delete item.id
           this.$refs.crudContact.rowCellAdd(item);
           this.$refs.crudContact.rowCell(item,this.contactsData.length - 1)
@@ -539,7 +529,6 @@ export default {
         this.$set(this.form,'saleman',res.data.data.salesName)
         this.$set(this.form,'corpId',res.data.data.corpsName[0].id)
         this.$set(this.form,'orgOrderNo', res.data.data.orgOrderNo)
-        this.$set(this.configuration,'dicData', res.data.data.corpsName)
         this.totalChange();  //调用合计 算出重量
       }).finally(()=>{
         this.buttonLoading = false;
@@ -717,18 +706,7 @@ export default {
             if(res.data.success){
               this.$message.success("保存成功!")
               detailReceiptList(res.data.data.id).then(res => {
-                this.form = res.data.data;
-                this.oldForm = Object.assign({},res.data.data);
-                this.receiptDisable = res.data.data.deliveryStatus === "已收货" ?   true :false
-                this.configuration.dicData = this.form.corpName
-                if(this.form.deliveryItemsList){
-                  this.contactsData = this.form.deliveryItemsList
-                  this.oldContactsData = this.deepClone(this.form.deliveryItemsList)
-                }
-                if(this.form.deliveryFilesList){
-                  this.upLoadData = this.form.deliveryFilesList
-                  this.oldUpLoadData = this.deepClone(this.form.deliveryFilesList)
-                }
+                this.afterData(res.data.data)
               })
             }
           }).finally(()=>{
@@ -766,18 +744,7 @@ export default {
             confirmReceipt(this.form).then(res =>{
               if(res.data.success){
                 this.$message.success("收货成功!")
-                this.form = res.data.data;
-                this.oldForm = Object.assign({},res.data.data);
-                this.receiptDisable = res.data.data.deliveryStatus === "已收货" ?   true :false
-                this.configuration.dicData = this.form.corpName
-                if(this.form.deliveryItemsList){
-                  this.contactsData = this.form.deliveryItemsList
-                  this.oldContactsData = this.deepClone(this.form.deliveryItemsList)
-                }
-                if(this.form.deliveryFilesList){
-                  this.upLoadData = this.form.deliveryFilesList
-                  this.oldUpLoadData = this.deepClone(this.form.deliveryFilesList)
-                }
+                this.afterData(res.data.data)
               }
             })
           }).finally(()=>{
@@ -794,18 +761,7 @@ export default {
             repealReceipt(this.form).then(res =>{
               if(res.data.success){
                 this.$message.success("撤销成功!")
-                this.form = res.data.data;
-                this.oldForm = Object.assign({},res.data.data);
-                this.receiptDisable = res.data.data.deliveryStatus === "已收货" ?   true :false
-                this.configuration.dicData = this.form.corpName
-                if(this.form.deliveryItemsList){
-                  this.contactsData = this.form.deliveryItemsList
-                  this.oldContactsData = this.deepClone(this.form.deliveryItemsList)
-                }
-                if(this.form.deliveryFilesList){
-                  this.upLoadData = this.form.deliveryFilesList
-                  this.oldUpLoadData = this.deepClone(this.form.deliveryFilesList)
-                }
+                this.afterData(res.data.data)
               }
             })
           }).finally(()=>{
@@ -815,6 +771,19 @@ export default {
         this.buttonLoading = false;
       }
     },
+    afterData(data){
+      this.form = data;
+      this.oldForm = Object.assign({},data);
+      this.receiptDisable = data.deliveryStatus === "已收货" ?   true :false
+      if(data.deliveryItemsList){
+        this.contactsData = data.deliveryItemsList
+        this.oldContactsData = this.deepClone(data.deliveryItemsList)
+      }
+      if(data.deliveryFilesList){
+        this.upLoadData = data.deliveryFilesList
+        this.oldUpLoadData = this.deepClone(data.deliveryFilesList)
+      }
+    },
     //导入采购明细
     importProMent(list){
       list.forEach((item,index) =>{

src/views/importTrade/receipt/index.vue

@@ -137,6 +137,7 @@ export default {
     // this.option = await this.getColumnData(this.getColumnName(40), option);
   },
   activated() {
+    this.show = true;
     setTimeout(() => {
       if(this.$route.query.params){
         this.detailData={

src/views/purchase/contract/config/customerContact.json

@@ -76,7 +76,7 @@
       "prop": "cntrNo",
       "cell": true,
       "index": 4,
-      "width":100,
+      "width":130,
       "rules": [
         {
           "required": false,

src/views/purchase/contract/detailsPage.vue

@@ -111,7 +111,7 @@
                 </el-select>
                 <div v-else-if="item.prop === 'advancePayment'">
                   <el-input type="age" v-model="form[item.prop]" style="width: 70%" :disabled="item.disabled?true:false || takeDisabled  || viewDisabled"  size="small" autocomplete="off" placeholder="请输入"></el-input>
-                  <el-select v-model="form['prepayCurrency']" size="small" style="width: 30%"  :disabled="item.disabled?true:false || takeDisabled  || viewDisabled" value="USD"   placeholder="请选择" clearable filterable>
+                  <el-select v-model="form['prepayCurrency']" size="small" style="width: 30%" :value="'USD'"  :disabled="item.disabled?true:false || takeDisabled  || viewDisabled" value="USD"   placeholder="请选择" clearable filterable>
                     <el-option v-for="(item,index) in currencyDic" :key="index" :label="item.dictValue"  :value="item.dictValue"></el-option>
                   </el-select>
                 </div>
@@ -512,7 +512,7 @@ export default {
             dicData: [],
             rules: [
               {
-                required: false,
+                required: true,
                 message: ' ',
                 trigger: 'blur'
               }
@@ -997,7 +997,7 @@ export default {
         if(contrastObj(this.form,this.oldForm) || contrastList(this.contactsData,this.oldContactsData)
           || contrastList(this.orderFeesList,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)
         ){
-          this.$confirm("数据发生变化，请先提交保存？", {
+          this.$confirm("数据发生变化，请先提交保存!", {
             confirmButtonText: "保存",
             cancelButtonText: "取消",
             type: "warning"
@@ -1041,7 +1041,7 @@ export default {
           }
         }
       }else{
-        this.$confirm("列表内存在新录入数据,是否先保存此数据?", {
+        this.$confirm("数据发生变化，请先提交保存!", {
           confirmButtonText: "保存",
           cancelButtonText: "取消",
           type: "warning"
@@ -1061,7 +1061,7 @@ export default {
         price:this.form.salesPrice,
         corpsName:this.form.corpsName,
         corpId:this.form.corpId,
-        // accDate:this.billType:   this.form.businesDate,
+        accDate:this.form.businesDate,
         currency:this.form.currency,
         exchangeRate:this.form.exchangeRate,
         srcParentId:this.form.id,
@@ -1075,7 +1075,7 @@ export default {
       if(contrastObj(this.form,this.oldForm) || contrastList(this.contactsData,this.oldContactsData)
         || contrastList(this.orderFeesList,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)
       ){
-        this.$confirm("数据发生变化，请先提交保存？", {
+        this.$confirm("数据发生变化，请先提交保存!", {
           confirmButtonText: "保存",
           cancelButtonText: "取消",
           type: "warning"
@@ -1153,7 +1153,7 @@ export default {
       if(contrastObj(this.form,this.oldForm) || contrastList(this.contactsData,this.oldContactsData)
         || contrastList(this.orderFeesList,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)
       ){
-        this.$confirm("数据发生变化，是否提交保存？", "提示", {
+        this.$confirm("数据发生变化，请先提交保存!", "提示", {
           confirmButtonText: "保存",
           cancelButtonText: "取消",
           type: "warning",

src/views/salesManagement/salesContract/config/mainList.json

@@ -15,13 +15,13 @@
   "editBtn": false,
   "delBtn": false,
   "menuWidth": 130,
+  "selectionWidth": 50,
   "align": "center",
   "dialogClickModal": false,
   "searchLabelWidth": 120,
   "searchIcon": true,
   "searchIndex": 2,
   "expandWidth": 38,
-  "selectionWidth": 40,
   "addBtnText": "创建单据",
   "expand": true,
   "rowKey": "id",

src/views/salesManagement/salesContract/detailsPage.vue

@@ -494,7 +494,7 @@ export default {
             dicData: [],
             rules: [
               {
-                required: false,
+                required: true,
                 message: ' ',
                 trigger: 'blur'
               }
@@ -850,6 +850,7 @@ export default {
         billNoList: this.importInventoryData.map(item =>{return item.billNo}),
         corpsName:this.form.corpName,
         corpId:this.form.corpId,
+        price:this.form.salesPrice,
         accDate:this.form.businesDate,
         currency:this.form.currency,
         exchangeRate:this.form.exchangeRate,

src/views/workManagement/receipt/settleAccounts.vue

@@ -108,15 +108,6 @@
       detailPage
     },
     created() {
-
-      if(this.$route.query.itemId){
-        this.detailData={
-          itemId:this.$route.query.itemId
-        }
-        this.show = false;
-        this.$store.commit("MAIN_IN_DETAIL");
-      }
-
       //模糊提前查20条数据
       getUserList().then(res=>{
         res.data.data.map((item,index)=>{
@@ -126,6 +117,18 @@
         })
       })
     },
+    activated() {
+      this.show = true;
+      setTimeout(() => {
+        if(this.$route.query.itemId){
+          this.detailData={
+            itemId:this.$route.query.itemId
+          }
+          this.show = false;
+          this.$store.commit("MAIN_IN_DETAIL");
+        }
+      }, 100);
+    },
     mounted() {
       // option.height = window.innerHeight - 340 ;
     },