修改

src/layout/components/Sidebar/index.vue

@@ -12,7 +12,7 @@
         :collapse-transition="false"
         mode="vertical"
       >
-        <div v-if="jurisdiction === '2016012550'">
+        <div v-if="jurisdiction === '2016012550' || jurisdiction === '2016012624' || jurisdiction === '2016012554'">
           <template v-for="(item, index) in menuList">
             <el-submenu
               :key="index"

src/views/list/api.js

@@ -8,6 +8,14 @@ export function getProjectList(data) {
     params: data
   })
 }
+/** 修改接口*/
+export function updateContractList(data) {
+  return request({
+    url: '/contract/contract/merge',
+    method: 'put',
+    data
+  })
+}
 /** 获取部门返回的完整阶级名称*/
 export function getCompleteName(data) {
   return request({

src/views/list/index.vue

@@ -65,7 +65,7 @@
         </div>
         <div>
           <el-button type="primary" @click="beforeBatChcheck">批量校验</el-button>
-          <el-button v-if="jurisdiction === '2016012550'" type="success" @click="beforeBatchExecution">批量推送</el-button>
+          <el-button v-if="jurisdiction === '2016012550' || jurisdiction === '2016012624' || jurisdiction === '2016012554'" type="success" @click="beforeBatchExecution">批量推送</el-button>
         </div>
       </div>
     </div>
@@ -105,13 +105,27 @@
               <template slot-scope="{ row }">
                 <el-link :underline="false" type="warning" @click.stop="updateFJXX(row)">附件</el-link>
                 <el-link :underline="false" type="primary" style="margin-left: 10px" @click.stop="update(row)">修改</el-link>
-                <el-link :underline="false" type="success" style="margin-left: 10px" @click.stop="pushInfo(row)">推送</el-link>
+                <el-link
+                  v-if="row.DELFLAG !== '2'"
+                  :underline="false"
+                  type="success"
+                  style="margin-left: 10px"
+                  @click.stop="pushInfo(row)"
+                >推送</el-link>
                 <el-link
                   v-if="!row.CONMAINCODE"
                   :underline="false"
                   type="danger"
                   style="margin-left: 10px "
-                  @click.stop="del(row)">删除</el-link>
+                  @click.stop="del(row)"
+                >删除</el-link>
+                <el-link
+                  v-if="row.CONMAINCODE && row.ENABLESTATUS !== '0'"
+                  :underline="false"
+                  type="danger"
+                  style="margin-left: 10px "
+                  @click.stop="stopUsing(row)"
+                >停用</el-link>
               </template>
             </el-table-column>
           </el-table>
@@ -152,14 +166,28 @@
               <template slot-scope="{ row }">
                 <el-link :underline="false" type="warning" @click.stop="updateFJXX(row)">附件</el-link>
                 <el-link :underline="false" type="primary" @click.stop="update(row)">修改</el-link>
-                <el-link :underline="false" type="success" style="margin-left: 10px" @click.stop="pushInfo(row)">推送</el-link>
+                <el-link
+                  v-if="row.DELFLAG !== '2'"
+                  :underline="false"
+                  type="success"
+                  style="margin-left: 10px"
+                  @click.stop="pushInfo(row)"
+                >推送</el-link>
                 <!--                <el-link :underline="false" type="warning" style="margin-left: 10px" @click.stop="examine(row)">审核</el-link>-->
                 <el-link
                   v-if="!row.CONMAINCODE"
                   :underline="false"
                   type="danger"
                   style="margin-left: 10px "
-                  @click.stop="del(row)">删除</el-link>
+                  @click.stop="del(row)"
+                >删除</el-link>
+                <el-link
+                  v-if="row.CONMAINCODE"
+                  :underline="false"
+                  type="danger"
+                  style="margin-left: 10px "
+                  @click.stop="stopUsing(row)"
+                >停用</el-link>
               </template>
             </el-table-column>
           </el-table>
@@ -200,13 +228,27 @@
               <template slot-scope="{ row }">
                 <el-link :underline="false" type="warning" @click.stop="updateFJXX(row)">附件</el-link>
                 <el-link :underline="false" type="primary" @click.stop="update(row)">修改</el-link>
-                <el-link :underline="false" type="success" style="margin-left: 10px" @click.stop="pushInfo(row)">推送</el-link>
+                <el-link
+                  v-if="row.DELFLAG !== '2'"
+                  :underline="false"
+                  type="success"
+                  style="margin-left: 10px"
+                  @click.stop="pushInfo(row)"
+                >推送</el-link>
                 <el-link
                   v-if="!row.CONMAINCODE"
                   :underline="false"
                   type="danger"
                   style="margin-left: 10px "
-                  @click.stop="del(row)">删除</el-link>
+                  @click.stop="del(row)"
+                >删除</el-link>
+                <el-link
+                  v-if="row.CONMAINCODE"
+                  :underline="false"
+                  type="danger"
+                  style="margin-left: 10px "
+                  @click.stop="stopUsing(row)"
+                >停用</el-link>
               </template>
             </el-table-column>
           </el-table>
@@ -249,6 +291,29 @@
         @size-change="allPageSizeChange"
       />
     </div>
+    <el-dialog width="50%" title="停用" :visible.sync="stopUsingDialog">
+      <el-form ref="stopUseForm" :model="stopUseForm">
+        <el-form-item
+          label="停用说明:"
+          prop="DEACTIVATEDESC"
+          :rules="[
+            { required: true, message: '请选择停用说明', trigger: 'change' }
+          ]"
+        >
+          <el-select v-model="stopUseForm.DEACTIVATEDESC" clearable placeholder="请选择停用说明">
+            <el-option
+              v-for="item in DM_TYSM"
+              :key="item.id"
+              :label="item.value"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="clickStopUse">确定</el-button>
+      </span>
+    </el-dialog>
     <el-dialog width="50%" title="推送失败" :visible.sync="errorDialog">
       <el-form :model="errorForm">
         <el-form-item label="失败原因:">
@@ -447,6 +512,7 @@
 <script>
 import { Store } from '@/utils/storage'
 import { storeKey } from '@/utils/auth'
+import { updateContractList } from '../list/api'
 export default {
   name: 'AdminList',
   beforeRouteEnter(to, from, next) {
@@ -469,6 +535,10 @@ export default {
   },
   data() {
     return {
+      stopUseParams: {
+
+      },
+      stopUsingDialog: false,
       disabledBtn2: false,
       disabledBtn: false,
       showError: false,
@@ -507,6 +577,7 @@ export default {
         type: '',
         param: ''
       },
+      DM_TYSM: [],
       serchForm: {
         CONMAINCODE: '',
         HSBGAMT: '',
@@ -519,6 +590,10 @@ export default {
         FROMID: '',
         SYNCHRONIZATIONSTATUS: ''
       },
+      stopUseForm: {
+        DEACTIVATEDESC: '',
+        ENABLESTATUS: '' // ’0‘停用状态
+      },
       errorForm: {
         errorInformation: ''
       },
@@ -872,9 +947,40 @@ export default {
     this.allFindContract() // 全部列表
   },
   methods: {
+    /** 停用操作*/
+    clickStopUse() {
+      this.$refs['stopUseForm'].validate((valide, object) => {
+        if (valide) {
+          this.stopUseParams.DEACTIVATEDESC = this.stopUseForm.DEACTIVATEDESC
+          this.stopUseParams.ENABLESTATUS = this.stopUseForm.ENABLESTATUS = '0'
+          updateContractList(this.stopUseParams).then(res => {
+            if (res.code === '200') {
+              this.stopUsingDialog = false
+              this.$message({
+                type: 'success',
+                message: '停用成功!'
+              })
+              if (this.activeName === 'first') {
+                this.findContract() // 个人列表
+              } else if (this.activeName === 'second') {
+                this.deptFindContract() // 部门列表
+              } else if (this.activeName === 'third') {
+                this.allFindContract() // 全部列表
+              }
+            } else {
+              this.$message({
+                type: 'success',
+                message: res.msg
+              })
+            }
+          })
+        }
+      })
+    },
     findMap() {
       this.$axios.get(this.HTTPApi + '/contract/contract/getDictData').then(res => {
         this.DM_FILETYPE = res.data.data.DM_FILETYPE
+        this.DM_TYSM = res.data.data.DM_TYSM
       })
         .catch(function(error) {
           console.log(error)
@@ -1568,6 +1674,13 @@ obj=this.typeform*/
           console.log(error)
         })
     },
+    /** 停用按钮操作*/
+    stopUsing(row) {
+      this.stopUseParams = row
+      this.stopUsingDialog = true
+      this.$refs.stopUseForm.clearValidate() // 清空验证
+      this.$refs.stopUseForm.resetFields() // 清空表单
+    },
     del: function(row) {
       this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
         confirmButtonText: '确定',

src/views/projectInfo/index.vue

@@ -113,12 +113,12 @@ export default {
   data() {
     return {
       jurisdiction: JSON.parse(Store.get(storeKey.user)).userId,
-      // 毛工账号有查看权限用户可以修改，推送，删除
+      // 毛斌，殷绮华，许靖莉账号，有查看权限用户，可以修改，推送，删除
       projectPerList: ['2017009369', '2017009368', '2016013051', '2017013969', '2017017971', '2017013968',
         '2019010032', '2016012588', '2016012589', '2021011460', '2021011459', '2016012717', '2016012906',
         '2016012784', '2016013006', '2016013108', '2016013046', '2016013155', '2017009391', '2016012542',
         '2016012554', '2019010020', '2016012599', '2017013970', '2016012620', '2016012591', '2016013069',
-        '2016012725', '2016012550'],
+        '2016012725', '2016012550', '2016012624', '2016012554'],
       Loading: false,
       projectForm: {
         ZPROJNAME: '',