Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/components/uploadFile/upload.vue

@@ -38,7 +38,7 @@ export default {
     },
     accept: {
       type: String,
-      default: '.jpg,.jpeg,.png,.bmp,.pdf,.JPG,.JPEG,.BMP,.PDF,.xls,.docx,.xlsx,.ppt,.pptx'
+      default: ''
     },
     // 文件名称
     name: {

anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js

@@ -171,9 +171,9 @@ const codemenu = [
   },
   // 付款申请管理待办详情
   {
-    path: '/fukuanguanliFlow/fukuanguanli/fukaunDaiBanInfo',
+    path: '/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo',
     component: () =>
-      import('@/views/workFlow/fukuanguanliFlow/fukuanguanli/fukaunDaiBanInfo.vue'),
+      import('@/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue'),
     name: 'fukaunDaiBanInfo'
   },
   // 付款申请管理已办详情

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue

@@ -49,35 +49,35 @@
             <el-table-column width="80px" fixed label="序号" type="index" :index="indexMethod" align="center"/>
             <el-table-column label="操作" fixed width="100px" align="center">
               <template slot-scope="scope">
-                <el-button type="success" size="mini" @click="handleEdit(scope.row)">办理</el-button>
+                <el-button type="primary" :disabled="scope.row.state === '未支付' ? false : true" size="mini" @click="handleEdit(scope.row)">办理</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="状态" width="140px" align="center">
+            <el-table-column label="状态" width="100px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.state }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="审批日期" align="center">
-              <template slot-scope="createTime">
-                <span>{{ scope.row.engineTypeValue }}</span>
+            <el-table-column label="审批日期" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.createTime }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="业务编号" align="center" width="150px">
+            <el-table-column label="业务编号" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.billNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="款项类别" align="center" width="180px">
+            <el-table-column label="款项类别" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.costTypeValue }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="款项名称" align="center" width="130px">
+            <el-table-column label="款项名称" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.costTitleValue }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="收款单位名称" align="center" width="130px">
+            <el-table-column label="收款单位名称" align="center" width="150">
               <template slot-scope="scope">
                 <span>{{ scope.row.receiveCompany }}</span>
               </template>
@@ -87,37 +87,37 @@
                 <span>{{ scope.row.receiveBankAccount }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="金额" align="center" width="130px">
+            <el-table-column label="金额" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.cost }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="付款银行" align="center" width="130px">
+            <el-table-column label="付款银行" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.payBank }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="付款账户" align="center" width="130px">
+            <el-table-column label="付款账户" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.payBankAccount }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="付款备注" align="center" width="130px">
+            <el-table-column label="付款备注" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.payRemark }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="付款人" align="center" width="130px">
+            <el-table-column label="付款人" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.name }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="付款日期" align="center" width="130px">
+            <el-table-column label="付款日期" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.payDate }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="付款凭证" align="center" width="180px" class-name="small-padding fixed-width">
+            <el-table-column label="付款凭证" align="center" class-name="small-padding fixed-width">
               <template slot-scope="scope">
                 <el-button size="mini" type="primary" @click="handleGetCheck(scope.row)">查看</el-button>
               </template>
@@ -142,8 +142,8 @@
             <span>付款方式</span>
           </el-col>
           <el-col :span="8">
-            <el-select v-model="formobj.payWayValue" placeholder="请选择" clearable>
-              <el-option v-for="item in payWay_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+            <el-select v-model="formobj.payWayValue" placeholder="请选择" @change="changePayWay" clearable>
+              <el-option v-for="item in payWay_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
             </el-select>
           </el-col>
           <el-col :span="4">
@@ -151,7 +151,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item>
-              <el-date-picker v-model="formobj.createTime" type="date" clearable value-format="yyyy-MM-dd" style="width: 93%" placeholder="请选择日期"/>
+              <el-date-picker v-model="formobj.payDate" type="date" clearable value-format="yyyy-MM-dd" style="width: 93%" placeholder="请选择日期"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -189,7 +189,7 @@
           </el-col>
           <el-col :span="20">
             <el-form-item>
-              <upload ref="uploadImg" v-model="diploma_list" :limit="1" bucket="map" :upload-data="{ type: '0001' }"/>
+              <upload ref="uploadImg" v-model="diploma_list" :accept="accept" @eett="backData" :limit="1" bucket="map" :upload-data="{ type: '0001' }"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -244,6 +244,7 @@ export default {
           btnLabel: '关闭'
         }
       ],
+      accept: '.jpg,.jpeg,.png,.JPG,.JPEG',
       isSearchShow: false,
       searchxianshitit: '显示查询条件',
       dialogImgVisible: false,
@@ -257,11 +258,11 @@ export default {
       state_list: [
         {
           dictKey: 1,
-          dictValue: '未付款'
+          dictValue: '未支付'
         },
         {
           dictKey: 2,
-          dictValue: '已付款'
+          dictValue: '已支付'
         }
       ],
       costType_list: [],
@@ -342,6 +343,12 @@ export default {
           this.costTitle_list = res.data
         }
       })
+      typeValues({ type: 'paymentType' }).then((res) => {
+        if (res.success) {
+          this.payWay_list = res.data
+        }
+      })
+      this.getList()
     },
     handleSelectionChange(row) {
       console.log('aaa', row)
@@ -395,6 +402,18 @@ export default {
       }
       this.getList()
     },
+    changePayWay(value) {
+      let bb = null
+      this.payWay_list.forEach((e) => {
+        if (e.dictValue === value) {
+          bb = {
+            key: e.dictKey,
+            value: e.dictValue
+          }
+        }
+      })
+      this.formobj.payWayKey = bb.key
+    },
     handleGetCheck(row) {
       this.dialogImgVisible = true
     },
@@ -405,14 +424,32 @@ export default {
       this.sids = aa
     },
     doDispose() {
+      if (this.sids.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请选择至少一条以上记录进行批量处理' })
+        return
+      }
       this.dialogVisible = true
     },
+    backData(val) {
+      if (val.length > 0) {
+        this.formobj.payFile = val[0].url
+      }
+    },
     handlePass() {
       this.formobj.sids = this.sids
+      this.formobj.name = window.sessionStorage.getItem('name')
+      this.formobj.userSid = window.sessionStorage.getItem('userSid')
+      req.update(this.formobj).then((resp) => {
+        if (resp.success) {
+          this.$message({ showClose: true, type: 'success', message: resp.msg })
+          this.handColse()
+        }
+      })
     },
     handColse() {
       this.dialogVisible = false
       this.formobj = {}
+      this.diploma_list = []
     },
     doClose() {
       this.$store.dispatch('tagsView/delView', this.$route)

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/payment.vue

@@ -89,7 +89,7 @@
             </el-table-column>
             <el-table-column label="收款账号" align="center" width="130px">
               <template slot-scope="scope">
-                <span>{{ scope.row.receiveCompany }}</span>
+                <span>{{ scope.row.receiveBankAccount }}</span>
               </template>
             </el-table-column>
             <el-table-column label="金额" align="center" width="130px">

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukaunDaiBanInfo.vue → anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue

@@ -8,7 +8,7 @@
         <el-button type="danger" @click="openStop('终止')">终 止</el-button>
       </div>
     </div>
-    <div class="listconadd">
+    <div class="">
       <el-form ref="dataForm" :model="formobj" class="formaddcopy02">
         <div class="wlInfo"><span>付款申请</span></div>
         <el-row>
@@ -81,7 +81,7 @@
         <el-row>
           <el-col :span="4" class="tleftb">意见</el-col>
           <el-col :span="20" class="trightb">
-            <el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" clearable ></el-input>
+            <el-input size="small" v-model="dialogList.comment" placeholder="审批意见" clearable ></el-input>
           </el-col>
         </el-row>
         <div style="text-align:center;margin-top: 20px;">
@@ -319,4 +319,11 @@ export default {
 .addinputwOne {
   margin-left: 120px !important;
 }
+.tleftb {
+  text-align: right;
+  font-size: 14px;
+  color: #606266;
+  line-height: 40px!important;
+  font-weight: 600;
+}
 </style>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue

@@ -7,7 +7,7 @@
         <el-button type="primary" size="small" :disabled="submitdisabled" @click="submitVehicleApply()">提交</el-button>
       </div>
     </div>
-    <div class="listconadd">
+    <div class="">
       <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
         <div class="wlInfo"><span>付款申请</span></div>
         <el-row>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue

@@ -6,7 +6,7 @@
         <el-button type="danger" @click="openRevoke()">撤 回 </el-button>
       </div>
     </div>
-    <div class="listconadd">
+    <div class="">
       <el-form ref="dataForm" :model="formobj" class="formaddcopy02">
         <div class="wlInfo"><span>付款申请</span></div>
         <el-row>
@@ -112,7 +112,7 @@ export default {
       params: {
         // 告诉父级页面，子页面的弹框高度。
         code: 2,
-        data: document.body.scrollHeight + 'px'
+        data: 800 + 'px'
       }
     }, '*')
   },