123

src/views/activiti/form/demoForm2.vue

@@ -568,7 +568,7 @@ export default {
                           }else if(this.processData.businessTable == 'expense_account'){//报销单
                           
                               let expense_type = this.$refs.KFB.form.getFieldValue('expense_type');
-                              if(expense_type != '差旅费报销'){ //业务需求报销/日常用品报销需要，其他不需要 
+                              if(expense_type == '业务需求报销' || expense_type == '日常用品报销'){ //业务需求报销/日常用品报销需要，其他不需要 
                                 this.printTitleImg = true;
                               }else{
                                 this.printTitleImg = false;

src/views/oa/SyCarryList.vue

@@ -78,7 +78,10 @@
            <a @click="handleEdit(record,'1')">详情</a>
            <a-divider type="vertical" />
             <a-popconfirm :title="'确定'+record.roleText+'吗?'" @confirm="() => plannerSubmit(record,1)" >
-               <a v-if="record.state !== '70'">{{ record.roleText }}</a>
+               <a v-if="record.state !== '70' && record.state !== '0' && record.state !== '1'">{{ record.roleText }}</a>
+            </a-popconfirm>
+            <a-popconfirm :title="'确定提交吗?'" @confirm="() => plannerSubmit(record,1)" >
+               <a v-if="record.state == '0'">提交</a>
             </a-popconfirm>
             <!-- <a-popconfirm title="确定人事行政审批吗?" @confirm="() => plannerSubmit(record,2)" v-if="record.state == '2'">
                 <a >人事行政审批</a>
@@ -97,7 +100,7 @@
                 <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 !== '0' && record.state !== '1'||record.state !== '70'" 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>