我的待办查询修改，发票撤回按钮

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

@@ -68,8 +68,12 @@
         </el-form-item>
         <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-option
+              v-for="item in this.$dictUtils.getDictList('collect_not')"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item v-if="showHideItem" prop="type" label="发票类型">
@@ -223,7 +227,7 @@
           <vxe-column min-width="120" title="收款日期"align="center" field="receivablesDate"></vxe-column>
           <vxe-column min-width="110" fixed="right"align="center" title="是否收款" field="receivablesStatus">
             <template slot-scope="scope">
-              {{scope.row.receivablesStatus === '1'?'已收款':'未收款'}}
+              {{$dictUtils.getDictLabel('collect_not', scope.row.type, '-')}}
             </template>
           </vxe-column>
           <vxe-column min-width="110" fixed="right"align="center" title="是否作废" field="invalidStatus">
@@ -243,6 +247,7 @@
               <el-button v-if="hasPermission('cw_finance:invoice:edit:detail')&&scope.row.status === '5'&&scope.row.receivablesStatus !== '1'" type="text"  size="small" @click="editDetail(scope.row.id)">修改发票明细</el-button>
               <el-button v-if="hasPermission('cw_finance:invoice:edit:receivables')&&scope.row.status === '5'&&scope.row.receivablesStatus !== '1'" type="text"   size="small" @click="view(true, scope.row.id)">收款</el-button>
               <el-button v-if="hasPermission('cw_finance:invoice:edit:is_receivables')&&scope.row.status === '5'&&scope.row.receivablesStatus !== '1'" type="text"   size="small" @click="isReceivables(scope.row)">确认收款</el-button>
+              <el-button v-if="hasPermission('cw_finance:invoice:edit:is_receivables')&&scope.row.status === '5'&&scope.row.receivablesStatus === '1'" type="text"   size="small" @click="recallReceivables(scope.row)">撤回收款</el-button>
               <el-button v-if="hasPermission('cw_finance:invoice:edit')&&scope.row.createBy.id === $store.state.user.id&&(scope.row.status === '5'||scope.row.status === '7')" type="text"  size="small" @click="invoiceInvalidPush(scope.row)">作废</el-button>
               <el-button v-if="hasPermission('cw_finance:invoice:edit')&&scope.row.createBy.id === $store.state.user.id&&scope.row.status === '6'" type="text"  size="small" @click="invoiceInvalidReBack(scope.row)">作废撤回</el-button>
               <el-button v-if="hasPermission('cw_finance:invoice:edit')&&scope.row.createBy.id === $store.state.user.id&&(scope.row.status === '1'||scope.row.status === '3')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
@@ -704,6 +709,19 @@
           })
         })
       },
+      recallReceivables (row) {
+        this.$confirm(`确定要撤回收款吗?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let param = {id: row.id, receivablesStatus: '0', receivablesDate: this.moment(new Date()).format('YYYY-MM-DD')}
+          this.financeInvoiceService.isReceivables(param).then(({data}) => {
+            this.$message.success(data)
+            this.refreshList()
+          })
+        })
+      },
       changeBillingDateList (event) {
         if (this.commonJS.isNotEmpty(this.searchForm.billingDateList)) {
           console.log('event', event)

src/views/modules/flowable/task/TodoList.vue

@@ -4,6 +4,9 @@
         <el-form-item label="实例标题" prop="title">
           <el-input size="small" v-model="searchForm.title" placeholder="实例标题" clearable></el-input>
         </el-form-item>
+        <el-form-item label="流程发起人" prop="assigneeName">
+          <UserSelect2 :userName="searchForm.assigneeName" :limit='1' @getValue='(value, label) =>{searchForm.assigneeName = label}'></UserSelect2>
+        </el-form-item>
         <el-form-item label="创建时间" prop="searchDates">
           <el-date-picker
             placement="bottom-start"
@@ -99,6 +102,7 @@
   // import FlowChart from '../modeler/FlowChart'
   import pick from 'lodash.pick'
   import UserSelect from '@/components/userSelect/UserSelectDialog'
+  import UserSelect2 from '@/components/userSelect'
   import TaskService from '@/api/flowable/TaskService'
   export default {
     props: {
@@ -122,6 +126,7 @@
           beginDate: '',
           endDate: '',
           title: '',
+          assigneeName: '',
           processDefinitionName: ''
         },
         searchDates: '',
@@ -201,7 +206,8 @@
       this.refreshList()
     },
     components: {
-      UserSelect
+      UserSelect,
+      UserSelect2
       // FlowChart
     },
     watch: {

src/views/modules/materialManagement/collect/CollectForm.vue

@@ -99,13 +99,6 @@
               <el-input v-model="scope.row.goodsName" @focus="openPurchasePageForm(scope.$rowIndex, scope.row)"></el-input>
             </template>
           </vxe-table-column>
-<!--          <vxe-table-column field="surplusNumber" title="剩余数量" :edit-render="{}">-->
-<!--            <template v-slot:edit="scope">-->
-<!--&lt;!&ndash;              <el-input @change="changeValue" v-model="scope.row.tradeNumber" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>&ndash;&gt;-->
-<!--&lt;!&ndash;              <el-input @change="changeValue" v-model="scope.row.tradeNumber" @blur="scope.row.tradeNumber = twoDecimalPlaces2(scope.row.tradeNumber)" maxlength="10"></el-input>&ndash;&gt;-->
-<!--              <el-input :disabled="true" v-model="scope.row.surplusNumber" maxlength="10"></el-input>-->
-<!--            </template>-->
-<!--          </vxe-table-column>-->
           <vxe-table-column field="collectNumber" title="领用数量" :edit-render="{}">
             <template v-slot:edit="scope">
               <!--              <el-input @change="changeValue" v-model="scope.row.tradeNumber" oninput ="value=value.replace(/\D|^0/g,'')" maxlength="10"></el-input>-->
@@ -113,6 +106,11 @@
               <el-input v-model="scope.row.collectNumber" @blur="scope.row.collectNumber = twoDecimalPlaces2(scope.row.collectNumber)" maxlength="10"></el-input>
             </template>
           </vxe-table-column>
+          <vxe-table-column v-if="this.status === 'audit'" field="surplusNumber" title="库存数量" :edit-render="{}">
+            <template v-slot:edit="scope">
+              <el-input :disabled="true" v-model="scope.row.surplusNumber" maxlength="10"></el-input>
+            </template>
+          </vxe-table-column>
           <vxe-table-column field="company" title="单位" :edit-render="{}" :rules="[{required: true, message:'请填写单位', trigger:'blur'}]">
             <template v-slot:edit="scope">
               <el-input v-model="scope.row.company"></el-input>
@@ -272,6 +270,8 @@
         this.keyWatch = keyWatch
       },
       init (method, id) {
+        console.log('this.status', this.status)
+        console.log('this.method', this.method)
         this.method = method
         this.inputForm = {
           fileInfoLost: [],