Procházet zdrojové kódy

修复一些已知问题

wucl před 4 měsíci
rodič
revize
781ea28ab1

+ 3 - 3
src/components/workflowBoard.vue

@@ -184,9 +184,9 @@ export default {
         if (val.nextHandlerId){
           commit.nextHandlerId =  val.nextHandlerId;
         }
-        if (!val.ifCheckTask){
-          commit.ifCheckTask = val.ifCheckTask;
-        }
+        // if (!val.ifCheckTask){
+        //   commit.ifCheckTask = val.ifCheckTask;
+        // }
       });
       if (isOk){
           this.$prompt('请填写处理意见,若无可直接点击确认按钮。',handldType,{

+ 13 - 6
src/views/finance/invoiceCheck.vue

@@ -202,7 +202,7 @@
             </el-table-column>
             <el-table-column label="已开金额" align="center" prop="planAmount">
               <template slot-scope="{row}">
-                <span>{{ row.planAmount }}</span>
+                <span>{{ row.realAmount }}</span>
               </template>
             </el-table-column>
             <el-table-column label="实际开票时间" align="center">
@@ -315,6 +315,11 @@
                 <span>{{ row.type }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="发票号" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.ticketNo }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="已开金额" align="center" prop="planAmount">
               <template slot-scope="{row}">
                 <span>{{ row.planAmount }}</span>
@@ -475,7 +480,7 @@
           <el-col :xs="24" :sm="12" :lg="12" :span="6">
             <el-form-item label="实开金额(元):" prop="realAmount" label-width="140px" class="postInfo-container-item"
             :rules="{ required: true, message: '实开金额不能为空', trigger: 'blur' }">
-              <el-input-number :precision="2" :min="0" :value-on-clear="0" v-model.number="invoice.realAmount" style="width: 100%;" class="filter-item" />
+              <el-input-number :precision="2" :min="0" :value-on-clear="0" v-model.number="invoice.realAmount" style="width: 100%;" class="filter-item" readonly disabled />
             </el-form-item>
           </el-col>
          
@@ -836,7 +841,9 @@ export default {
     openMakeDialog(row){
       this.newInvoiceDialog= true;
       this.invoice = row;
-      this.invoice.realAmount = row.planAmount;
+      if (!this.invoice.realAmount){
+        this.invoice.realAmount = row.planAmount;
+      }
     },
     makeInvoice(){
       this.$refs.invoice.validate(valid=>{
@@ -866,7 +873,7 @@ export default {
                   duration: 2000
                 });
                 this.newInvoiceDialog= false;
-                this.getList();
+                this.getList1();
               }else {
                 this.$notify({
                   title: '失败',
@@ -897,7 +904,7 @@ export default {
                   duration: 2000
                 });
                 this.newInvoiceDialog= false;
-                this.getList();
+                this.getList1();
               }else {
                 this.$notify({
                   title: '失败',
@@ -925,7 +932,7 @@ export default {
                   duration: 2000
                 });
                 this.newInvoiceDialog= false;
-                this.getList();
+                this.getList1();
               }else {
                 this.$notify({
                   title: '失败',

+ 1 - 0
src/views/major/todoDetail.vue

@@ -2192,6 +2192,7 @@ export default {
       refuseForm:{
         reason:null
       },
+      year: '2025'
     }
   },
   created() {

+ 1 - 1
src/views/major/todoList.vue

@@ -250,7 +250,7 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="batchCommitDialog = false">取 消</el-button>
+        <el-button @click="allocationDialog = false">取 消</el-button>
         <el-button type="primary" @click="saveAllocation()">确 定</el-button>
       </div>
     </el-dialog>