Browse Source

报告作废调整

lizhenhao 2 years ago
parent
commit
40a68c5cf1

+ 1 - 7
src/views/modules/cw/reportCancellApply/ReportCancellApplyList.vue

@@ -75,13 +75,7 @@
           :data="dataList"
           :checkbox-config="{}">
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
-          <vxe-column min-width="160" align="center" title="单据编号" field="documentNo">
-            <template slot-scope="scope">
-              <el-link  type="primary" :underline="false" v-if="hasPermission('cwProjectReport:list')" @click="view(scope.row.id)">{{scope.row.documentNo}}</el-link>
-              <el-link  type="primary" :underline="false" v-else-if="hasPermission('cwProjectReport:list')"  @click="view(scope.row.id,)">{{scope.row.documentNo}}</el-link>
-              <span v-else>{{scope.row.documentNo}}</span>
-            </template>
-          </vxe-column>
+          <vxe-column min-width="160" align="center" title="单据编号" field="documentNo"></vxe-column>
           <vxe-column min-width="160" align="center" title="报告文号" field="reportNo">
             <template slot-scope="scope">
               <el-link  type="primary" :underline="false" v-if="hasPermission('cwProjectReport:list')&&commonJS.isNotEmpty(scope.row.reportId)" @click="viewReport(scope.row.reportId)">{{scope.row.reportNo}}</el-link>

+ 12 - 12
src/views/modules/cw/reportCancellApply/ReportCancellApplyTaskForm.vue

@@ -396,7 +396,7 @@
                 <el-form-item label="下一节点审核人" prop="reportDetail.reviewBy"
                               :rules="[
                    ]">
-                  <el-select v-model="inputForm.reportDetail.reviewBy" placeholder="请选择下一节点审核人" style="width:100%;">
+                  <el-select :disabled="true" v-model="inputForm.reportDetail.reviewBy" placeholder="请选择下一节点审核人" style="width:100%;">
                     <el-option
                       v-for="item in reviewBys"
                       :key="item.index"
@@ -601,6 +601,17 @@
             </el-row>
           </el-row>
 
+          <el-row  :gutter="15" style="margin-top: 30px">
+            <el-col :span="24">
+              <el-form-item label="作废原因" prop="cancellateReason"
+                            :rules="[
+                              {required: true, message:'作废原因不能为空', trigger:'blur'}
+                   ]">
+                <el-input type="textarea" v-model="inputForm.cancellateReason" placeholder="请填写作废原因" clearable></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
           <el-row>
             <el-tabs v-model="activeName" type="border-card" @tab-click="tabHandleClick">
 
@@ -620,17 +631,6 @@
             </el-tabs>
           </el-row>
 
-          <el-row  :gutter="15" style="margin-top: 30px">
-            <el-col :span="24">
-              <el-form-item label="作废原因" prop="cancellateReason"
-                            :rules="[
-                              {required: true, message:'作废原因不能为空', trigger:'blur'}
-                   ]">
-                <el-input type="textarea" v-model="inputForm.cancellateReason" placeholder="请填写作废原因" clearable></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
         </el-form>
       </el-col>
     </el-row>