6654

src/views/sound/road/collect/noise-bill.vue

@@ -72,10 +72,14 @@
           <a-space>
             <a-button @click="detail(record)" shape="round" size="small">查看</a-button>
             <span v-hasPermi="['ecology:sound:verify']">
-              <a-popconfirm v-if="record.checked != 1" :title="`审核通过后将无法修改，确认？`" ok-text="Yes" cancel-text="No"
-                @confirm="verify(record)">
+              <a-popconfirm  v-if="record.checked != 1" :title="`审核通过后将无法修改，确认？`" ok-text="Yes" cancel-text="No"
+                @confirm="verify(record,1)">
                 <a-button type="primary" shape="round" size="small">审核</a-button>
               </a-popconfirm>
+              <a-popconfirm v-else :title="`撤回重新编辑，确认？`" ok-text="Yes" cancel-text="No"
+                @confirm="verify(record,0)">
+                <a-button type="dashed" shape="round" size="small">撤回</a-button>
+              </a-popconfirm>
             </span>
             <a-popconfirm :title="`确认删除${record.billName}吗?`" ok-text="Yes" cancel-text="No" @confirm="remove(record)">
               <a-button type="primary" danger shape="round" size="small">删除</a-button>
@@ -171,6 +175,12 @@
               customRender: 'checked',
             },
 
+          },
+          {
+            title: '创建人',
+            dataIndex: 'username',
+            sorter: true,
+
           },
           // {
           //   title: '更新时间',
@@ -231,13 +241,14 @@
         this.editableData[record.roadNoiseBillId].reportTime = moment(this.editableData[record.roadNoiseBillId]
           .reportTime)
       },
-      verify(record) {
+      verify(record,checked) {
         const hide = this.$message.loading('请求中..', 0);
         verifyRoadNoiseBill({
-          roadNoiseBillId: record.roadNoiseBillId
+          roadNoiseBillId: record.roadNoiseBillId,
+          checked
         }).then(res => {
           if (res.data.code == 0) {
-            record.checked = 1
+            record.checked = checked
             this.$message.success(res.data.msg);
           } else {
             this.$message.error(res.data.msg);

src/views/sound/road/collect/noise.vue

@@ -299,6 +299,11 @@
             title: 'LmaxdB(A)',
             dataIndex: 'indexLmax',
             sorter: true
+          },
+           {
+            title: '创建人',
+            dataIndex: 'username',
+            sorter: true
           },
           {
             title: '操作',

src/views/sound/road/collect/place-bill.vue

@@ -73,9 +73,12 @@
           <a-button @click="detail(record)" shape="round" size="small">查看</a-button>
           <span v-hasPermi="['ecology:sound:verify']">
             <a-popconfirm v-if="record.checked != 1" :title="`审核通过后将无法修改，确认？`" ok-text="Yes" cancel-text="No"
-              @confirm="verify(record)">
+              @confirm="verify(record,1)">
               <a-button type="primary" shape="round" size="small">审核</a-button>
             </a-popconfirm>
+            <a-popconfirm v-else :title="`撤回重新编辑，确认？`" ok-text="Yes" cancel-text="No" @confirm="verify(record,0)">
+              <a-button type="dashed" shape="round" size="small">撤回</a-button>
+            </a-popconfirm>
           </span>
           <a-popconfirm :title="`确认删除${record.billName}吗?`" ok-text="Yes" cancel-text="No" @confirm="remove(record)">
             <a-button type="primary" danger shape="round" size="small">删除</a-button>
@@ -169,6 +172,12 @@
               customRender: 'checked',
             },
 
+          },
+          {
+            title: '创建人',
+            dataIndex: 'username',
+            sorter: true,
+
           },
           // {
           //   title: '更新时间',
@@ -229,13 +238,14 @@
         this.editableData[record.roadPlaceBillId].reportTime = moment(this.editableData[record.roadPlaceBillId]
           .reportTime)
       },
-      verify(record) {
+      verify(record, checked) {
         const hide = this.$message.loading('请求中..', 0);
         verifyRoadPlaceBill({
-          roadPlaceBillId: record.roadPlaceBillId
+          roadPlaceBillId: record.roadPlaceBillId,
+          checked
         }).then(res => {
           if (res.data.code == 0) {
-            record.checked = 1
+            record.checked = checked
             this.$message.success(res.data.msg);
           } else {
             this.$message.error(res.data.msg);

src/views/sound/road/collect/place.vue

@@ -248,6 +248,11 @@
             title: '声校准仪器编号',
             dataIndex: 'soundInstrumentCode',
             sorter: true
+          },
+            {
+            title: '创建人',
+            dataIndex: 'username',
+            sorter: true
           },
           {
             title: '操作',