湾办修改

src/api/portal/GATHER/GATHER.js

@@ -51,6 +51,15 @@ export function updateGATHER(data) {
     data: data
   })
 }
+// 湾办修改数据采集
+export function wbUpdateGATHER(data) {
+  return request({
+    url: '/gather/wbEdit',
+    method: 'post',
+    data: data
+  })
+}
+
 
 // 删除数据采集
 export function delGATHER(id) {

src/views/GATHER/index.vue

@@ -294,6 +294,19 @@
           </template>
 
           <template
+            v-if="scope.row.reportStatus == 1
+             && checkPermi(['gather:GATHER:adminedit'])"
+          >
+            <el-button
+              style="margin: 0 2px"
+              size="mini"
+              type="text"
+              @click="handleDetail(scope.row, 1)"
+              >湾办修改</el-button
+            >
+          </template>
+
+          <template
             v-if="(scope.row.collStatus == 0 || scope.row.collStatus == 1||scope.row.collStatus == 2) && (scope.row.approveStatus == 0 || scope.row.approveStatus == 3)
              && checkPermi(['gather:GATHER:admin'])"
           >
@@ -651,22 +664,17 @@
                 :model="listItem"
                 :ref="'form' + listItem.normfeeId"
                 :key="listItem.normfeeId"
-                :disabled="listItem.sendValue == 1 || (listItem.sendValue == undefined)"
+                :disabled="listItem.sendValue == 1 || listItem.sendValue == undefined"
                 :label-width="(index == 1 || index == 3) ? '350px' : '250px'"
                 >
-                <!-- <span>{{ listItem.sendValue == 1 }}</span> -->
-                <!-- label-width="350px" -->
                 <el-col :span="8">
                   <el-form-item
-
                   style="padding:10px;"
                     :label="
                       listItem.normfeeName + '（' + listItem.funitName + '）'
                     "
                     prop="collCalue"
                   >
-                  <!-- <p>{{ edit }}</p> -->
-
                   <el-input
                       :disabled="!edit"
                       v-if="edit == true"
@@ -727,6 +735,114 @@
         </el-timeline>
       </div>
     </el-dialog>
+
+    <!-- 湾办录入 -->
+    <el-dialog
+      center
+      @close="handleClose"
+      :title="title"
+      :visible.sync="openDetail"
+      width="95%"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+    <div 
+       v-for="(item, index) in tabList"
+          :key="index + 'tabs'"
+          :label="item.normName"
+          :name="item.normName"
+       >
+
+       <el-col :span="24"   
+       style="border:1px solid rgba(0, 0, 0, .05); margin-bottom: 5px; padding: 4px"
+       >
+        <p style="font-weight: 600;margin:0; margin-bottom: 5px; font-size: 17px;">{{ item.normName }}</p>
+        
+          <template v-for="listItem in form.feeLists">
+              <el-form
+                v-if="listItem.normId == item.normId"
+                :rules="
+                  validatorList(
+                    listItem.normfeeCode,
+                    listItem.normfeeName,
+                    listItem.sendValue
+                  )
+                "
+                :model="listItem"
+                :ref="'form' + listItem.normfeeId"
+                :key="listItem.normfeeId"
+                :disabled="!checkPermi(['gather:GATHER:adminedit'])"
+                :label-width="(index == 1 || index == 3) ? '350px' : '250px'"
+                >
+                <el-col :span="8">
+                  <el-form-item
+                  style="padding:10px;"
+                    :label="
+                      listItem.normfeeName + '（' + listItem.funitName + '）'
+                    "
+                    prop="collCalue"
+                  >
+                  <el-input
+                      :disabled="false"
+                      v-if="edit == true"
+                      v-model="listItem.collCalue"
+                      :placeholder="'请输入' + listItem.normfeeName"
+                    ></el-input>
+                    <!-- <div v-if="edit == false" style="background-color: rgba(0, 0, 0, .03); padding-left: 5px;" >{{ listItem.collCalue || listItem.collCalue == 0 ? listItem.collCalue :"请输入" }}</div> -->
+                  </el-form-item>
+                </el-col>
+              </el-form>
+            </template>
+        </el-col>
+</div>
+      
+      <div slot="footer" class="dialog-footer">
+        <!-- <el-button v-if="audit &&  (this.form.collStatus != 2 && this.form.collStatus==1)" type="primary" @click="handleAudit(form)">提交审核</el-button> -->
+        <el-button type="primary" @click="submitForm('edit',1)" 
+          >确 定</el-button
+        >
+        
+        <!-- <el-button @click="submitForm('draft')" v-if="edit && this.form.collStatus!=1" type="warning">暂 存</el-button>
+
+        <el-button type="primary" v-if="check" @click="handleCheck(1)"
+          >通 过</el-button
+        >
+        <el-button type="warning" v-if="check" @click="handleReject"
+          >驳 回</el-button
+        > -->
+        <el-button  @click="cancel">返 回</el-button>
+      </div>
+
+      <div class="remark" v-if="form.taskVoList != 0">
+        <div class="remark_title" style="margin-bottom: 20px">审批记录：</div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(item, index) in form.taskVoList"
+            :timestamp="item.createTime"
+            placement="top"
+            :key="index + 'taskHisAction'"
+          >
+            <el-card>
+              <p>
+                {{ item.execName }}------{{
+                  item.status == 0
+                    ? "待审核"
+                    : item.status == 1
+                    ? "同意"
+                    : item.status == 2
+                    ? "驳回"
+                    : "退回"
+                }}------{{ item.acname }}------{{ item.createTime }}
+                <p v-if="item.comments != null">{{
+                  "审核意见：" + item.comments
+                }}</p>
+              </p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -739,6 +855,7 @@ import {
   delGATHER,
   addGATHER,
   updateGATHER,
+  wbUpdateGATHER,
   getInfoByColl,
   approve,
   report,
@@ -1355,7 +1472,7 @@ export default {
       });
     },
     /** 提交按钮 */
-    submitForm(type) {
+    submitForm(type,is) {
       // 验证表单
       let p = [];
       p = this.form.feeLists.map((item, index) => {
@@ -1379,13 +1496,24 @@ export default {
             msg = "录入成功";
           } else if (type == "edit") {
             this.form.collStatus = 1;
-            updateGATHER(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
-              this.getList();
-              this.openDetail = false;
-              compute(this.form).then((response) => {});
-            });
-            return;
+            if(is){
+              wbUpdateGATHER(this.form).then((response) => {
+                this.$modal.msgSuccess("修改成功");
+                this.getList();
+                this.openDetail = false;
+                compute(this.form).then((response) => {});
+              });
+              return;
+            }else{
+              updateGATHER(this.form).then((response) => {
+                this.$modal.msgSuccess("修改成功");
+                this.getList();
+                this.openDetail = false;
+                compute(this.form).then((response) => {});
+              });
+              return;
+
+            }
           }else if(type == 'draft'){
             this.form.collStatus = 2;
             msg = "操作成功";