发票管理调整

src/components/userSelect/index.vue

@@ -20,7 +20,7 @@ export default {
   props: {
     limit: Number,
     value: String,
-    name: String,
+    userName: String,
     size: {
       type: String,
       default: () => { return 'small' }
@@ -65,7 +65,7 @@ export default {
       immediate: false,
       deep: false
     },
-    name: {
+    userName: {
       handler (newVal) {
         this.name = newVal
       },

src/views/modules/finance/invoice/InvoiceFormTask.vue

@@ -306,6 +306,8 @@
         <el-col :span="12">
           <el-form-item label="实际开票人" prop="billingPeopleReal"
                         :rules="[
+                        {required: true, message:'实际开票人不能为空', trigger:'blur'},
+                        {required: true, message:'实际开票人不能为空', trigger:'change'}
                ]">
             <SelectUserTree
               ref="companyTree"
@@ -325,6 +327,8 @@
         <el-col :span="12">
           <el-form-item label="对账人" prop="reconciliationPeople"
                         :rules="[
+                        {required: true, message:'对账人不能为空', trigger:'blur'},
+                        {required: true, message:'对账人不能为空', trigger:'change'}
                ]">
             <SelectUserTree
               ref="companyTree"
@@ -344,6 +348,8 @@
         <el-col :span="12">
           <el-form-item label="对账地区" prop="reconciliationArea"
                         :rules="[
+                        {required: true, message:'对账地区不能为空', trigger:'blur'},
+                        {required: true, message:'对账地区不能为空', trigger:'change'}
                ]">
             <SelectTree
               ref="areaTree"

src/views/modules/finance/invoice/InvoiceList.vue

@@ -14,29 +14,65 @@
             <el-button slot="append" @click="openProgramPageForm()" icon="el-icon-search"></el-button>
           </el-input>
         </el-form-item>
-        <el-form-item>
-          <el-button type="default" @click="showHide" size="small" :icon="showHideIcon">{{showHideName}}</el-button>
-          <el-button type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
-          <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
+        <el-form-item v-if="showHideItem" prop="accountBegin" label="开票总金额">
+          <el-input-number
+            size="small"
+            v-model="searchForm.accountBegin"
+            controls-position="right"
+            :controls="false"
+            style="width:100%;"
+            :precision="2"
+            placeholder="请填写开票总金额"
+            :step="0.01"
+            :min="0"
+            clearable>
+          </el-input-number>
         </el-form-item>
-      </el-row>
-      <el-row v-if="showHideItem" :gutter="0">
-        <el-form-item prop="reconciliationPeopleName" label="对账人">
-          <UserSelect :limit='1' :name="searchForm.reconciliationPeopleName" @getValue='(value, label) => {searchForm.reconciliationPeopleName = label}'></UserSelect>
+        <el-form-item v-if="showHideItem" prop="accountEnd" label="-">
+          <el-input-number
+            size="small"
+            v-model="searchForm.accountEnd"
+            controls-position="right"
+            :controls="false"
+            style="width:100%;"
+            :precision="2"
+            placeholder="请填写开票总金额"
+            :step="0.01"
+            :min="0"
+            clearable>
+          </el-input-number>
+        </el-form-item>
+        <el-form-item v-if="showHideItem" prop="reconciliationPeopleName" label="对账人">
+          <UserSelect :limit='1' :userName="searchForm.reconciliationPeopleName" @getValue='(value, label) => {searchForm.reconciliationPeopleName = label}'></UserSelect>
         </el-form-item>
-        <el-form-item label="经办人" prop="operator">
-          <UserSelect :limit='1' :name="searchForm.operator" @getValue='(value, label) => {searchForm.operator = label}'></UserSelect>
+        <el-form-item v-if="showHideItem" label="经办人" prop="operator">
+          <UserSelect :limit='1' :userName="searchForm.operator" @getValue='(value, label) => {searchForm.operator = label}'></UserSelect>
+        </el-form-item>
+        <el-form-item v-if="showHideItem" prop="operatorOffice" label="经办人部门">
+          <SelectTree
+            ref="officeTree"
+            :props="{
+                  value: 'id',             // ID字段名
+                  label: 'name',         // 显示名称
+                  children: 'children'    // 子级字段名
+                }"
+
+            :url="`/sys/office/treeData?type=2`"
+            :value="searchForm.operatorOffice"
+            :clearable="true"
+            :accordion="true"
+            @getValue="(value) => {searchForm.operatorOffice=value}"/>
         </el-form-item>
-        <el-form-item prop="billingWorkplaceReal" label="开票单位">
+        <el-form-item v-if="showHideItem" prop="billingWorkplaceReal" label="开票单位">
           <el-input size="small" v-model="searchForm.billingWorkplaceReal" placeholder="请输入开票单位" clearable></el-input>
         </el-form-item>
-        <el-form-item prop="receivablesStatus" label="是否收款">
+        <el-form-item v-if="showHideItem" prop="receivablesStatus" label="是否收款">
           <el-select v-model="searchForm.receivablesStatus" placeholder="请选择是否收款" clearable>
             <el-option label="是" value="1"></el-option>
             <el-option label="否" value="0"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="type" label="发票类型">
+        <el-form-item v-if="showHideItem" prop="type" label="发票类型">
           <el-select v-model="searchForm.type" placeholder="请选择发票类型" clearable>
             <el-option
               v-for="item in this.$dictUtils.getDictList('invoice_type')"
@@ -46,7 +82,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="receivablesType" label="收款类型">
+        <el-form-item v-if="showHideItem" prop="receivablesType" label="收款类型">
           <el-select v-model="searchForm.receivablesType" placeholder="请选择收款类型"clearable>
             <el-option
               v-for="item in $dictUtils.getDictList('invoice_receivables_type')"
@@ -56,7 +92,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="billingContent" label="开票内容">
+        <el-form-item v-if="showHideItem" prop="billingContent" label="开票内容">
           <el-select v-model="searchForm.billingContent" placeholder="请选择开票内容"clearable>
             <el-option
               v-for="item in $dictUtils.getDictList('invoice_billing_content')"
@@ -66,7 +102,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="reconciliationArea" label="对账地区">
+        <el-form-item v-if="showHideItem" prop="reconciliationArea" label="对账地区">
           <SelectTree
             ref="areaTree"
             :props="{
@@ -81,9 +117,7 @@
             @getValue="(value) => {searchForm.reconciliationArea=value}"/>
         </el-form-item>
 
-      </el-row>
-      <el-row v-if="showHideItem" :gutter="0">
-        <el-form-item prop="billingDateList" label="开票日期">
+        <el-form-item v-if="showHideItem" prop="billingDateList" label="开票日期">
           <el-date-picker
             size="small"
             @change="changeBillingDateList"
@@ -98,7 +132,7 @@
             clearabl>
           </el-date-picker>
         </el-form-item>
-        <el-form-item prop="remittanceDateList" label="收款日期">
+        <el-form-item v-if="showHideItem" prop="remittanceDateList" label="收款日期">
           <el-date-picker
             size="small"
             v-model="searchForm.remittanceDateList"
@@ -112,35 +146,11 @@
             clearable>
           </el-date-picker>
         </el-form-item>
-      </el-row>
-      <el-row v-if="showHideItem" :gutter="0">
-        <el-form-item prop="accountBegin" label="开票总金额">
-          <el-input-number
-            size="small"
-            v-model="searchForm.accountBegin"
-            controls-position="right"
-            :controls="false"
-            style="width:100%;"
-            :precision="2"
-            placeholder="请填写开票总金额"
-            :step="0.01"
-            :min="0"
-            clearable>
-          </el-input-number>
-        </el-form-item>
-        <el-form-item prop="accountEnd" label="-">
-          <el-input-number
-            size="small"
-            v-model="searchForm.accountEnd"
-            controls-position="right"
-            :controls="false"
-            style="width:100%;"
-            :precision="2"
-            placeholder="请填写开票总金额"
-            :step="0.01"
-            :min="0"
-            clearable>
-          </el-input-number>
+
+        <el-form-item>
+          <el-button type="default" @click="showHide" size="small" :icon="showHideIcon">{{showHideName}}</el-button>
+          <el-button type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
+          <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
         </el-form-item>
       </el-row>
     </el-form>
@@ -172,7 +182,7 @@
           <vxe-column type="checkbox" width="40" ></vxe-column>
           <vxe-column width="150" title="项目名称"align="center" field="programName">
             <template slot-scope="scope">
-              <el-link  type="primary" :underline="false" @click="viewProject(scope.row.id)">{{scope.row.programName}}</el-link>
+              <el-link  type="primary" :underline="false" @click="viewProject(scope.row.id)">{{commonJS.isEmpty(scope.row.financeInvoiceBaseDTOList[0].programId)?'其他：':''}}{{scope.row.programName}}</el-link>
             </template>
           </vxe-column>
           <vxe-column width="150" title="发票申请编号"align="center" field="no">
@@ -183,6 +193,7 @@
           <vxe-column width="150" title="发票号"align="center" field="number"></vxe-column>
           <vxe-column width="150" title="实际开票单位"align="center" field="billingWorkplaceReal"></vxe-column>
           <vxe-column width="150" title="经办人"align="center" field="operator"></vxe-column>
+          <vxe-column width="150" title="经办人部门"align="center" field="operatorOffice"></vxe-column>
           <vxe-column width="150" title="开票总金额（元）"align="center" field="account"></vxe-column>
           <vxe-column width="150" title="开票金额（元）"align="center" field="accountDetail"></vxe-column>
           <vxe-column width="120" title="开票内容"align="center" field="billingContent">
@@ -279,7 +290,8 @@
           programName: '',
           programId: '',
           reconciliationPeopleName: '',
-          operator: ''
+          operator: '',
+          operatorOffice: ''
         },
         dataList: [],
         tablePage: {
@@ -479,7 +491,8 @@
           programName: '',
           programId: '',
           reconciliationPeopleName: '',
-          operator: ''
+          operator: '',
+          operatorOffice: ''
         }
         this.$refs.searchForm.resetFields()
         this.refreshList()