森语-搬运工对账单-操作

src/views/oa/SyCarryList.vue

@@ -77,16 +77,16 @@
           <a-divider type="vertical" v-if="record.state == '0'"/>
            <a @click="handleEdit(record,'1')">详情</a>
            <a-divider type="vertical" />
-            <a-popconfirm title="确定计划员提交吗?" @confirm="() => plannerSubmit(record,1)" v-if="record.state == '0'">
-               <a >计划员提交</a>
+            <a-popconfirm :title="'确定'+record.roleText+'吗?'" @confirm="() => plannerSubmit(record,1)">
+               <a >{{ record.roleText }}</a>
             </a-popconfirm>
-            <a-popconfirm title="确定人事行政审批吗?" @confirm="() => plannerSubmit(record,2)" v-if="record.state == '2'">
+            <!-- <a-popconfirm title="确定人事行政审批吗?" @confirm="() => plannerSubmit(record,2)" v-if="record.state == '2'">
                 <a >人事行政审批</a>
             </a-popconfirm>
             <a-popconfirm title="确定财务经理审批吗?" @confirm="() => plannerSubmit(record,3)" v-if="record.state == '3'">
                 <a >财务经理审批</a>
-            </a-popconfirm>
-            <a-divider type="vertical" v-if="record.state == '1' || record.state == '2'||record.state == '3'||record.state == '0'" />
+            </a-popconfirm> -->
+            <a-divider type="vertical" v-if="record.state !== '0' && record.state !== '1'||record.state !== '70'" />
             <a-dropdown>
                <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
@@ -94,10 +94,10 @@
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)" v-if="record.state == '0'">
                   <a>删除</a>
                 </a-popconfirm>
-                <a-popconfirm title="确定计划员取消提交吗?" @confirm="() => plannerSubmit(record,-1)"  v-if="record.state == '1' || record.state == '2'">
+                <a-popconfirm title="确定计划员取消提交吗?" @confirm="() => plannerSubmit(record,-1)"  v-if="record.state !== '0' && record.state !== '70'">
                   <a >计划员取消提交</a>
                 </a-popconfirm>
-                <a-popconfirm title="确定一键回退吗?" @confirm="() => Fallback(record)" v-if="record.state == '1' || record.state == '2'||record.state == '3'" v-has="'syCarry:initial'">
+                <a-popconfirm title="确定一键回退吗?" @confirm="() => Fallback(record)" v-if="record.state !== '0' && record.state !== '1'||record.state !== '70'" v-has="'syCarry:initial'">
                   <a >一键回退</a>
                 </a-popconfirm>
               </a-menu-item>
@@ -163,10 +163,10 @@
           {
             title: '状态',
             align:"center",
-            dataIndex: 'state',
+            dataIndex: 'roleText',
             width: 100,
 
-            scopedSlots: { customRender: 'state' },
+            // scopedSlots: { customRender: 'state' },
           },
           {
             title: '账户信息',
@@ -208,7 +208,7 @@
       },
       // 计划员提交
       plannerSubmit(record,state){
-         getAction('/oa/syCarry/commitBatch', {ids:record.id,state:state}).then((res) => {
+         getAction('/oa/syCarry/commitBatch', {ids:record.id,state:record.state}).then((res) => {
           if(res.success){
             this.loadData()
           }else{