7.16修改部分功能

src/views/allot/rwd_list.vue

@@ -98,6 +98,7 @@
       <el-table-column align="center" label="查看报检" width="60">
         <template slot-scope="scope">
           <el-button type="success" size="small" circle icon="el-icon-view" title="预览报检单" @click="editBjd(scope.$index)" />
+          <el-button type="info" size="small" circle icon="el-icon-edit" title="修改报检单" @click="modifyBjd(scope.$index)" />
         </template>
       </el-table-column>
     </el-table>
@@ -222,6 +223,15 @@ export default {
         this.$router.push({ path: '/bjd/bjd-jj-input/' + bjd.bjdId + '/' + bjd.shebeizhongleidaima + '/' + bjd.shebeizhongleidaima + type })
       }
     },
+    modifyBjd($index) {
+      const bjd = this.list[$index]
+      const type = '/finish'
+      if (bjd.jianyanleibie === 'DJ') {
+        this.$router.push({ path: '/bjd/bjd-dj-input/' + bjd.bjdId + '/' + bjd.shebeizhongleidaima + '/' + bjd.shebeizhongleidaima + type, params: { form: 1 }})
+      } else {
+        this.$router.push({ path: '/bjd/bjd-jj-input/' + bjd.bjdId + '/' + bjd.shebeizhongleidaima + '/' + bjd.shebeizhongleidaima + type, params: { form: 1 }})
+      }
+    },
     printRwd() {
       if (this.multipleSelection.length > 1) {
         this.$message({ message: '只能打印一份任务单', type: 'error' })

src/views/allot/tuihui_list.vue

@@ -19,11 +19,11 @@
       </sticky>
       <el-form>
         <el-form-item>
-          <el-select v-model="listQuery.searchRw.shebeizhongleidaima" placeholder="请选择设备种类" clearable>
+          <el-select v-model="listQuery.shebeizhongleidaima" placeholder="请选择设备种类" clearable>
             <el-option v-for="item in sbzlList" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
-          <el-input v-model="listQuery.searchRw.serialNumber" placeholder="报检单号" clearable style="width: 160px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.serialNumber" placeholder="报检单号" clearable style="width: 160px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchRw.shiyongdanwei" placeholder="使用单位名称" clearable style="width: 300px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.shiyongdanwei" placeholder="使用单位名称" clearable style="width: 300px" @keyup.enter.native="handleFilter" />
           <el-button type="primary" icon="el-icon-search" @click="handleFilter">
             查询
           </el-button>
@@ -31,8 +31,8 @@
             清除
           </el-button>
           <br>
-          <el-input v-model="listQuery.searchRw.zhucedaima" placeholder="注册代码" clearable style="width: 220px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.zhucedaima" placeholder="注册代码" clearable style="width: 220px" @keyup.enter.native="handleFilter" />
-          <el-input v-model="listQuery.searchRw.shiyongdengjibianhao" placeholder="使用登记证编号" clearable style="width: 180px" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.shiyongdengjibianhao" placeholder="使用登记证编号" clearable style="width: 180px" @keyup.enter.native="handleFilter" />
         </el-form-item>
       </el-form>
     </div>
@@ -76,9 +76,6 @@
             <el-button type="danger" size="mini" circle icon="el-icon-close" title="拒绝" @click="updateBohui(scope.row.id, 'danger')" />
           </span>&nbsp;&nbsp;&nbsp;&nbsp;
           <el-button size="mini" type="info" icon="el-icon-message" title="查看退回原因" circle @click="viewBohui(scope.row.id)" />
-          <el-button size="mini" type="info" title="查看退回附件" circle @click="viewFujian(scope.row.id)">
-            <svg-icon icon-class="old" />
-          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -159,8 +156,7 @@ export default {
       tempDepartment: {},
       listQuery: {
         pageNum: 1, // 页码
-        pageRow: 20, // 每页条数
+        pageRow: 20 // 每页条数
-        searchRw: {}
       },
       renwudan: {
         teamId: '',
@@ -192,7 +188,7 @@ export default {
     }
   },
   created() {
-    this.getList()
+    // this.getList()
     this.getSbzlList()
     this.getDepartment()
     this.getUserList(this.departmentId)
@@ -263,7 +259,7 @@ export default {
     },
     viewBohui(id) { // 任务撤回
       this.api({
-        url: '/taskinfoView/list',
+        url: '/taskinfo/list',
         method: 'get',
         params: {
           renwuId: id
@@ -465,11 +461,14 @@ export default {
     },
     handleFilter() {
       // 查询事件
+      console.log(this.listQuery)
       this.listQuery.pageNum = 1
       this.getList()
     },
     clearSearch() {
-      this.listQuery.searchRw = {
+      this.listQuery = {
+        pageNum: 1, // 页码
+        pageRow: 20
       }
       this.getList()
     },

src/views/allot/zuofei_list.vue

@@ -123,7 +123,7 @@ export default {
     },
     viewBohui(id) { // 任务撤回
       this.api({
-        url: '/taskinfoView/list',
+        url: '/taskinfo/list',
         method: 'get',
         params: {
           renwuId: id

src/views/bjd/dj_create.vue

@@ -243,8 +243,15 @@ export default {
     },
     handleFilter() {
       // 查询事件
+      if (!this.listQuery.shebeizhongleidaima) {
+        this.$message({
+          message: '请先选择设备种类',
+          type: 'warning'
+        })
+      } else {
         this.listQuery.pageNum = 1
         this.getList()
+      }
     },
     clearSearch() {
       this.listQuery = {

src/views/bjd/dj_list.vue

@@ -284,10 +284,11 @@ export default {
         return false
       } else {
         for (let i = 0; i < this.multipleSelection.length; i++) {
-          this.$confirm('共' + this.multipleSelection.length + '条报检项目将作废，是否继续?', '提示', {
+          this.$prompt('请输入作废原因', '共' + this.multipleSelection.length + '条报检项目将作废，是否继续?', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
-            type: 'warning'
+            inputPattern: /\S/,
+            inputErrorMessage: '作废原因不能为空'
           }).then(() => {
             for (let i = 0; i < this.multipleSelection.length; i++) {
               this.ids.push(this.multipleSelection[i].id)

src/views/bjd/jj_list.vue

@@ -23,9 +23,6 @@
           <el-button type="info" icon="el-icon-delete" @click="delBjd">
             删除
           </el-button>
-          <el-button v-if="hasRole('JDFPRW')" type="primary" icon="el-icon-delete" @click="showUpdateSgLxrDhDialog">
-            修改施工联系人电话
-          </el-button>
         </div>
       </sticky>
       <el-form>

src/views/search/list.vue

@@ -234,7 +234,7 @@ export default {
       this.taskInfoListData.length = 0
       this.loading = true
       this.api({
-        url: '/taskinfoView/list',
+        url: '/taskinfo/list',
         method: 'get',
         params: {
           renwuId: taskinfo.id,

src/views/task/list.vue

@@ -21,6 +21,9 @@
           <el-button v-if="notHasDepartmentId(74)" type="success" icon="el-icon-success" @click="completeRenwu">
             任务完成
           </el-button>
+          <el-button type="info" icon="el-icon-minus" @click="terminationFn">
+            终止任务
+          </el-button>
         </div>
       </sticky>
       <el-form>
@@ -627,6 +630,7 @@ export default {
     deleteRenwu() {
       if (!this.$refs.list.selection.length) {
         this.$message.error('请选择要作废的任务')
+        return false
       }
       this.$prompt('正在执行作废任务操作,确定继续?', '提示', {
         inputType: 'textarea',
@@ -664,6 +668,7 @@ export default {
     completeRenwu() {
       if (!this.$refs.list.selection.length) {
         this.$message.error('请选择要完成的任务')
+        return false
       }
       this.$confirm('正在执行任务完成操作，确定继续?', '提示', {
         confirmButtonText: '确定',
@@ -689,6 +694,37 @@ export default {
         })
       })
     },
+    // 终止任务
+    terminationFn() {
+      if (!this.$refs.list.selection.length) {
+        this.$message.error('请选择要终止的任务')
+        return false
+      }
+      this.$prompt('请输入终止原因', '确认提前终止任务？', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputPattern: /\S/,
+        inputErrorMessage: '终止原因不能为空'
+      }).then(() => {
+        this.apibjd({
+          url: 'renwu/terminateRenwu',
+          method: 'put',
+          params: {
+            renwuIds: this.$refs.list.selection.map(rw => {
+              return rw.id
+            }).join(',')
+          }
+        }).then(data => {
+          this.$message.success('任务已终止')
+          this.getList()
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消'
+        })
+      })
+    },
     /**
      * 显示相关鉴证文件上传窗口
      * @param renwuId