Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/main.js

@@ -77,7 +77,10 @@ function getUserInfo() {
       userSid: data.sid,
       orgSid: data.organizationSid, // 单位sid
       Orgname: data.organizationName,
-      dwjb: data.dwjb
+      dwjb: data.dwjb,
+      orgNamePath: data.orgNamePath, // 使用组织全路径名称
+      orgSidPath: data.orgSidPath, // 使用组织全路径Sid
+      pNameAndDepartmentNameAndPostName:data.pNameAndDepartmentNameAndPostName
     }
     // 结果存入缓存
     window.sessionStorage.setItem('staffSid', user.staffSid)
@@ -89,6 +92,9 @@ function getUserInfo() {
     window.sessionStorage.setItem('user', user)
     window.sessionStorage.setItem('departmentName', user.departmentName)
     window.sessionStorage.setItem('departmentSid', user.departmentSid)
+    window.sessionStorage.setItem('orgNamePath', user.orgNamePath)
+    window.sessionStorage.setItem('orgSidPath', user.orgSidPath)
+    window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', user.pNameAndDepartmentNameAndPostName)
     new Vue({
       el: '#app',
       router,

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/feiyongshenqing/expense.vue

@@ -263,7 +263,7 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
-      this.list.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
       req.listPage(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/feiyongshenqing/expenseAdd.vue

@@ -282,6 +282,11 @@ export default {
       })
     },
     submitVehicleApply() {
+      if (!this.checked) {
+        this.formobj.isVeh = 0
+      } else {
+        this.formobj.isVeh = 1
+      }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
@@ -309,6 +314,7 @@ export default {
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
       this.formobj = {}
+      this.checked = false
       this.$refs['form_obj'].resetFields()
       this.$emit('doback')
     }

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/feiyongguanliFlow/feiyongguanli/chooseVinNo.vue

@@ -8,7 +8,7 @@
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
-      <div class="main-content">
+      <div class="">
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/feiyongguanliFlow/feiyongguanli/feiyongDaiBanInfo.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>
@@ -77,7 +77,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;">
@@ -130,7 +130,9 @@ export default {
     this.linkByParameter.instanceId = obj.instanceId
     this.linkByParameter.taskId = obj.taskId
     this.linkByParameter.taskDefKey = obj.taskDefKey
+    console.log(window.sessionStorage.getItem('orgSidPath'), 99999999)
     this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    console.log(window.sessionStorage.getItem('userSid'), 99999999)
     this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
     this.current.taskDefKey = obj.taskDefKey
     this.current.taskName = obj.taskName
@@ -314,4 +316,20 @@ export default {
 .addinputwOne {
   margin-left: 120px !important;
 }
+.tleftb {
+  text-align: right;
+  font-size: 14px;
+  color: #606266;
+  line-height: 40px!important;
+  font-weight: 600;
+}
+.headline{
+  height: 40px;
+  padding: 10px;
+  font-weight: bold;
+  font-size: 20px;
+  background-color: #0294d7;
+  text-align: left;
+  color: #ffffff;
+}
 </style>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/feiyongguanliFlow/feiyongguanli/feiyongEdit.vue

@@ -166,7 +166,6 @@ export default {
           this.useType_list = res.data
         }
       })
-      this.newDate()
     },
     UpNumber(e) {
       e.target.value = e.target.value.replace(/[^\d.-]/g, '') // 清除“数字”和“.”"-"以外的字符
@@ -188,6 +187,7 @@ export default {
       req.fetchBySid(sid).then((resp) => {
         if (resp.success) {
           this.formobj = resp.data
+          this.formobj.instanceId = resp.data.procInstId
           if (this.formobj.isVeh === 1) {
             this.checked = true
             this.formobj.vinNo = this.formobj.vinNoList.join(',')
@@ -283,6 +283,11 @@ export default {
       })
     },
     submitVehicleApply() {
+      if (!this.checked) {
+        this.formobj.isVeh = 0
+      } else {
+        this.formobj.isVeh = 1
+      }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/feiyongguanliFlow/feiyongguanli/feiyongYiBanInfo.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>
@@ -186,4 +186,13 @@ export default {
 .addinputwOne {
   margin-left: 120px !important;
 }
+.headline{
+  height: 40px;
+  padding: 10px;
+  font-weight: bold;
+  font-size: 20px;
+  background-color: #0294d7;
+  text-align: left;
+  color: #ffffff;
+}
 </style>