Bläddra i källkod

报销流程以及会计所长权限设置功能开发

user5 2 år sedan
förälder
incheckning
b062eb6e88

+ 3 - 3
src/views/modules/cw/reimbursementApproval/info/ReimbursementForm.vue

@@ -377,7 +377,7 @@
                 <el-input v-model="scope.row.typeName" @focus="typePullForm4(scope.$rowIndex)"></el-input>
               </template>
             </vxe-table-column>
-            <vxe-table-column field="projectName" title="报销项目" :edit-render="{}" :rules="[{required: true, message:'请选择报销项目', trigger:'blur'}]">
+            <vxe-table-column field="projectName" title="报销详情" :edit-render="{}" :rules="[{required: true, message:'请填写报销详情', trigger:'blur'}]">
               <template v-slot:edit="scope">
                 <el-input v-model="scope.row.projectName" @focus="openProgramPageForm4(scope.$rowIndex, scope.row)"></el-input>
               </template>
@@ -1517,9 +1517,9 @@
                   throw new Error('报销详情第' + k + '行请选择报销类型')
                 }
                 if (this.commonJS.isEmpty(this.inputForm.detailInfoOthers[j].projectName)) {
-                  this.$message.error('报销详情第' + k + '行请选择报销项目')
+                  this.$message.error('报销详情第' + k + '行请填写报销详情')
                   this.loading = false
-                  throw new Error('报销详情第' + k + '行请选择报销项目')
+                  throw new Error('报销详情第' + k + '行请填写报销详情')
                 }
                 if (this.commonJS.isEmpty(this.inputForm.detailInfoOthers[j].number)) {
                   this.$message.error('报销详情第' + k + '行请输入费用')

+ 18 - 2
src/views/modules/sys/office/OfficeForm.vue

@@ -106,6 +106,14 @@
             </el-select>
           </el-form-item>
         </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="分管领导" prop="administrator">
+            <!--<UserSelectSignatory size="medium"  :readonly="true" :limit='1' :value="inputForm.administrator"></UserSelectSignatory>-->
+            <UserSelect size="medium" :readonly="true"  :limit='1' :value="inputForm.administrator" @getValue='(value) => {inputForm.administrator = value}'></UserSelect>
+          </el-form-item>
+        </el-col>
+
       </el-row>
 
     </el-form>
@@ -119,6 +127,8 @@
 <script>
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
   import OfficeService from '@/api/sys/OfficeService'
+  import UserSelectSignatory from '@/views/modules/cw/workClientInfo/clientUserSelect'
+  import UserSelect from '@/components/userSelect'
   export default {
     data () {
       return {
@@ -147,12 +157,15 @@
           fax: '', // 传真
           email: '', // 邮箱
           useable: '', // 是否可用
-          isPublic: '' // 是否公有
+          isPublic: '', // 是否公有
+          administrator: '' // 分管领导
         }
       }
     },
     components: {
-      SelectTree
+      SelectTree,
+      UserSelectSignatory,
+      UserSelect
     },
     officeService: null,
     created () {
@@ -176,6 +189,7 @@
           this.inputForm.id = obj.id
           this.inputForm.parent.id = obj.parent.id
           this.inputForm.parent.name = obj.parent.name
+
           if (method === 'edit' || method === 'view') { // 修改或者查看
             this.loading = true
             this.officeService.queryById(this.inputForm.id).then(({data}) => {
@@ -190,6 +204,7 @@
         this.$refs['inputForm'].validate((valid) => {
           if (valid) {
             this.loading = true
+            console.log(this.inputForm)
             this.officeService.save(this.inputForm).then(({data}) => {
               this.loading = false
               this.$message({
@@ -208,6 +223,7 @@
       getValue (value) {
         this.inputForm.parent.id = value
         this.inputForm.isPublic = ''
+        this.inputForm.administrator = ''
       }
     }
   }