Merge remote-tracking branch 'origin/pet' into dev

src/views/evaluation/branch_hazard_assessment/components/evaluation.vue

@@ -82,6 +82,19 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="8" v-if="searchForm.userIs == '1'">
+          <el-form-item label="本人考评时间">
+            <el-date-picker
+              v-model="searchForm.userIsDate"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              style="width: 100%;"/>
+          </el-form-item>
+        </el-col>
         <el-col :span="4">
           <el-form-item label-width="10px">
             <el-button v-waves type="primary" icon="el-icon-search" @click="getList">
@@ -154,6 +167,13 @@
           </template>
         </template>
       </el-table-column>
+      <el-table-column prop="userIsTime" label="本人考评时间" v-if="searchForm.userIsDate != undefined && searchForm.userIsDate != '' && searchForm.userIsDate[0]">
+        <template slot-scope="{row}">
+          <template>
+            <span>{{ row.userIsTime }}</span>
+          </template>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" width="400px">
         <template slot-scope="{row}">
           <el-button type="info" icon="el-icon-view" @click="fnViewHidden(row.HIDDEN_ID)">查看隐患详情</el-button>
@@ -185,6 +205,8 @@
           <tr :key="item.CONFIG_USER_ID">
             <td class="tbg">考评人员</td>
             <td>{{ item.USER_NAME }}</td>
+            <td class="tbg">考评时间</td>
+            <td>{{ item.CREATTIME ? item.CREATTIME : "暂未考评" }}</td>
             <td class="tbg">是否符合</td>
             <td>
               <span v-if="item.RESULT === 1">符合</span>
@@ -265,7 +287,8 @@ export default {
         DEPARTMENT_ID: null,
         STATE: '',
         hiddendescr: '',
-        userIs: ''
+        userIs: '',
+        userIsDate : []
       },
       evaluationDialog: {
         visible: false,
@@ -323,6 +346,7 @@ export default {
       this.searchForm.STATE = ''
       this.searchForm.hiddendescr = ''
       this.searchForm.userIs = ''
+      this.searchForm.userIsDate = ''
       this.getList()
     },
     // 获取列表
@@ -334,6 +358,8 @@ export default {
           ...this.searchForm,
           START_TIME: this.searchForm.dates && this.searchForm.dates[0],
           END_TIME: this.searchForm.dates && this.searchForm.dates[1],
+          USER_IS_START_TIME: this.searchForm.userIsDate && this.searchForm.userIsDate[0],
+          USER_IS_END_TIME: this.searchForm.userIsDate && this.searchForm.userIsDate[1],
           CORPINFO_ID: this.$parent.CORPINFO_ID,
           EVALUATIONCONFIG_ID: this.$parent.EVALUATIONCONFIG_ID,
           TYPE: this.$parent.TYPE

src/views/keyprojects/outsourced/components/list.vue

@@ -154,11 +154,13 @@
           <span>({{ row.VIDEO_ONLINE_COUNT }})</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="400">
+      <el-table-column label="操作" align="center" width="500">
         <template slot-scope="{row}">
           <el-button type="success" icon="el-icon-view" size="mini" @click="goDetail(row.OUTSOURCED_ID)">查看</el-button>
           <el-button v-if="row.CREATOR==userInfoUserId && row.STATE==-1" type="success" icon="el-icon-view" size="mini" @click="handleState(row.OUTSOURCED_ID)">开工审批</el-button>
           <el-button v-if="row.CREATOR==userInfoUserId && row.STATE==-2" type="success" icon="el-icon-view" size="mini" @click="handleJie(row.OUTSOURCED_ID)">结束审批</el-button>
+          <el-button v-if="1 == row.STATE" type="danger" icon="el-icon-delete" size="mini" @click="handlePreForceDelete(row)">强制结束</el-button>
+          <el-button v-if="2 == row.STATE" type="success" icon="el-icon-view" size="mini" @click="handlePreForceDelete(row)">查看关联</el-button>
           <el-button v-show="edit" v-if="0 === row.IS_CORP_TYPE" type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.OUTSOURCED_ID)">编辑</el-button>
           <el-button v-show="del" v-if="0 === row.IS_CORP_TYPE" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.OUTSOURCED_ID)">删除</el-button>
         </template>
@@ -183,6 +185,152 @@
         <el-button v-print="'#printTest'" type="primary">打 印</el-button>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="dialogPreDeleteShow" title="强制结束" width="80%" class="top-dialog">
+      <p>待确认的安全环保检查</p>
+      <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="inspectList"
+      :row-key="getRowKeyInsp"
+      :header-cell-style="{
+        'font-weight': 'bold',
+        'color': '#000'
+      }"
+      tooltip-effect="dark"
+      border
+      fit
+      highlight-current-row
+    > 
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column prop="INSPECTION_PLACE" label="检查场所" show-overflow-tooltip />
+      <el-table-column prop="INSPECTION_TYPE_NAME" label="检查类型" show-overflow-tooltip />
+      <el-table-column prop="INSPECTION_USERS" label="检查人" show-overflow-tooltip />
+      <el-table-column prop="PERSON_NAME" label="被检查人" show-overflow-tooltip />
+      <el-table-column label="检查时间" show-overflow-tooltip>
+        <template slot-scope="{row}">
+          {{ row.INSPECTION_TIME_START }}-{{ row.INSPECTION_TIME_END }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="HIDDEN_COUNT" label="检查隐患数" />
+    </el-table>
+    <p>待整改隐患</p>
+    <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="zgList"
+      :row-key="getRowKeyCf"
+      :header-cell-style="{
+        'font-weight': 'bold',
+        'color': '#000'
+      }"
+      tooltip-effect="dark"
+      border
+      fit
+      highlight-current-row
+    >
+      <el-table-column type="index" label="序号" width="50" align="center" />
+
+      <el-table-column prop="HIDDENDESCR" label="隐患描述" show-overflow-tooltip />
+      <el-table-column label="隐患发现人" show-overflow-tooltip>
+        <template slot-scope="{row}">
+          {{ row.CREATOR_NAME || row.CREATOR_NAMES }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="CREATTIME" label="隐患发现时间" show-overflow-tooltip />
+      <el-table-column prop="RECTIFICATIONOR_NAME" label="隐患整改人" show-overflow-tooltip />
+      <el-table-column prop="CREATOR_NAME" label="隐患验收人" show-overflow-tooltip />
+      <el-table-column label="是否处罚">
+        <template slot-scope="{row}">
+          {{ row.ISPUNISH === "1" ? "是" : row.ISPUNISH === "2" ?"否":"处罚人未处理" }}
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <p>待验收隐患</p>
+    <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="ysList"
+      :row-key="getRowKeyCf"
+      :header-cell-style="{
+        'font-weight': 'bold',
+        'color': '#000'
+      }"
+      tooltip-effect="dark"
+      border
+      fit
+      highlight-current-row
+    >
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column prop="HIDDENDESCR" label="隐患描述" show-overflow-tooltip />
+      <el-table-column prop="CREATTIME" label="隐患发现时间" show-overflow-tooltip />
+      <el-table-column prop="RECTIFICATIONOR_NAME" label="隐患整改人" show-overflow-tooltip />
+      <el-table-column prop="RECTIFICATIONTIME" label="整改时间" show-overflow-tooltip />
+      <el-table-column prop="CREATOR_NAME" label="隐患验收人" show-overflow-tooltip />
+      <el-table-column label="是否处罚">
+        <template slot-scope="{row}">
+          {{ row.ISPUNISH === "1" ? "是" : row.ISPUNISH === "2" ?"否":"处罚人未处理" }}
+        </template>
+      </el-table-column>
+    </el-table>
+
+      <p>待处罚</p>
+
+      <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="cfList"
+      :row-key="getRowKeyCf"
+      :header-cell-style="{
+        'font-weight': 'bold',
+        'color': '#000'
+      }"
+      tooltip-effect="dark"
+      border
+      fit
+      highlight-current-row
+    >
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column prop="CREATOR_NAME" label="下发人" show-overflow-tooltip />
+      <el-table-column label="是否处罚">
+        <template slot-scope="{row}">
+          {{ row.ISPUNISH === "1" ? "是" : row.ISPUNISH === "2" ?"否":"处罚人未处理" }}
+        </template>
+      </el-table-column>
+    </el-table>
+
+      <p>待反馈处罚</p>
+      <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="fkList"
+      :row-key="getRowKeyCf"
+      :header-cell-style="{
+        'font-weight': 'bold',
+        'color': '#000'
+      }"
+      tooltip-effect="dark"
+      border
+      fit
+      highlight-current-row
+    >
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column prop="REASON" label="处罚原因" show-overflow-tooltip />
+      <el-table-column prop="CREATOR_NAME" label="下发人" show-overflow-tooltip />
+      <el-table-column prop="UNITS_NAME" label="被处罚单位" show-overflow-tooltip />
+      <el-table-column prop="PERSON_NAME" label="被处罚人" show-overflow-tooltip />
+      <el-table-column label="处罚处理状态" show-overflow-tooltip>
+        <template slot-scope="{row}">
+          {{ row.HANDLED === "0" ? "待处理" : "已处理" }}
+        </template>
+      </el-table-column>
+    </el-table>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button v-if="selectOSTATE == 1" @click="forceJie" type="danger" icon="el-icon-delete">强制结束</el-button>
+        <el-button @click="dialogPreDeleteShow = false">关 闭</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -221,6 +369,7 @@ export default {
       STATE: '',
       varList: [],
       dialogFormShow: false,
+      dialogPreDeleteShow: false,
       pd: [],
       unitsList: [],
       corpList: [],
@@ -228,6 +377,14 @@ export default {
       groupCorpList: [],
       treeDataInspectDept: [],
       treeDeptOptions: [],
+      inspectList:[],// 带确认安全环保检查
+      zgList:[],// 待整改隐患
+      ysList:[],// 待验收隐患
+      cfList:[],// 待处罚
+      fkList:[],// 待反馈处罚
+      aiList:[],// AI报警
+      selectOID: '',
+      selectOSTATE:'',
       defaultProps: {
         value: 'id',
         children: 'nodes',
@@ -280,6 +437,12 @@ export default {
     getRowKey(row) {
       return row.OUTSOURCED_ID
     },
+    getRowKeyInsp(row) {
+      return row.KEYPROJECTCHECK_ID
+    },
+    getRowKeyCf(row) {
+      return row.HIDDEN_ID
+    },
     // 搜索
     getQuery() {
       this.$refs.multipleTable.clearSelection()
@@ -459,6 +622,57 @@ export default {
       }).catch(() => {
       })
     },
+    handlePreForceDelete(row){
+      this.dialogPreDeleteShow = true
+      requestFN(
+        '/outsourced/preForceDelete',
+        { OUTSOURCED_ID: row.OUTSOURCED_ID }
+      ).then((data) => {
+        this.inspectList = data.inspectList // 待确认的安全环保检查
+        this.zgList = data.zgList  // 需整改的隐患
+        this.ysList = data.ysList  // 需验收的隐患
+        this.cfList = data.cfList  // 待处罚
+        this.fkList = data.fkList  // 待反馈的处罚
+        this.aiList = data.aiList  // 关联的AI报警
+        this.selectOID = row.OUTSOURCED_ID
+        this.selectOSTATE = row.STATE
+      }).catch((e) => {
+      })
+
+    },
+    // 全部删除接口
+    forceJie(){
+      if (!this.selectOID) {
+        this.$message('请勿重复点击', {
+        confirmButtonText: '确定',
+        type: 'warning'
+      })
+      }
+      // ---
+      this.$confirm('确定要结束该重点工程吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        requestFN(
+          '/outsourced/forceJie',
+          {OUTSOURCED_ID: this.selectOID}
+        ).then((data) => {
+          this.dialogPreDeleteShow = false
+          this.selectOID = ''
+          this.selectOSTATE = ''
+          this.getList()
+          this.$forceUpdate()
+        }).catch((e) => {
+          this.selectOID = ''
+          this.selectOSTATE = ''
+        })
+
+      }).catch(() => {
+      })
+      // ---
+
+    },
     getUnitsList() {
       requestFN(
         '/units/listAll',

src/views/system/group/centerUserInfo/index.vue

@@ -308,12 +308,12 @@ export default {
           {required: true, message: '角色不能为空', trigger: 'blur'}
         ],
         USERNAME: [
-          {required: true, message: '用户名不能为空', trigger: 'blur'},
+          {required: true, message: '用户名不能为空', trigger: 'blur'}
-          {
+        // ,{
-            pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
+        //     pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
-            message: '用户名需使用手机号码格式'
+        //     message: '用户名需使用手机号码格式'
-          },
+        //   },
-          {validator: hasUser, trigger: 'blur'}
+        //   {validator: hasUser, trigger: 'blur'}
         ],
         NAME: [
           {required: true, message: '姓名不能为空', trigger: 'blur'},

src/views/system/group/userCenter/index.vue

@@ -276,12 +276,12 @@ export default {
           { required: true, message: '角色不能为空', trigger: 'blur' }
         ],
         USERNAME: [
-          { required: true, message: '用户名不能为空', trigger: 'blur' },
+          { required: true, message: '用户名不能为空', trigger: 'blur' }
-          {
+          // ,{
-            pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
+          //   pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
-            message: '用户名需使用手机号码格式'
+          //   message: '用户名需使用手机号码格式'
-          },
+          // },
-          { validator: hasUser, trigger: 'blur' }
+          // { validator: hasUser, trigger: 'blur' }
         ],
         NAME: [
           { required: true, message: '姓名不能为空', trigger: 'blur' },
@@ -465,7 +465,7 @@ export default {
           CARD_TYPE_NAME: '身份证',
           NATION: row.NATION_NAME || '',
           SEX: row.SEX === '0' ? '男' : '女',
-          USER_TYPE: '1',
+          USER_TYPE: '0',
           ISDELETE: row.ISDELETE != null ? row.ISDELETE : "0"
         }
       ).then((data) => {