Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

2019-08-20 13:03:10 +08:00
parent d02ecfcdf9 b054b30bf2
commit 6900c7a551
4 changed files with 132 additions and 14 deletions
--- a/src/views/BasicData/PersonnelManagement/index.vue
+++ b/src/views/BasicData/PersonnelManagement/index.vue
@@ -85,8 +85,31 @@
            size="mini"
            @selection-change="handleSelectionChange">
            <el-table-column
+              align="center"
              type="selection"
-              width="55"/>
+              width="50"/>
+            <el-table-column align="center" label="照片" width="50">
+              <template slot-scope="scope">
+                <el-popover
+                  v-if="scope.row.文件标识 && scope.row.文件标识 !== 'null'"
+                  placement="top-start"
+                  width="200"
+                  trigger="hover">
+                  <el-button type="text" style="float:right" @click="deletePhoto(scope.row)">删除</el-button>
+                  <el-image :src="scope.row.文件标识 && scope.row.文件标识 !== 'null' ? (readFile + scope.row.文件标识 + '.' + scope.row.文件后缀) : readFile + '123.jpg'">
+                    <div slot="error" class="image-slot">
+                      <i class="el-icon-picture-outline"/>
+                    </div>
+                  </el-image>
+                  <el-image slot="reference" :src="scope.row.文件标识 && scope.row.文件标识 !== 'null' ? (readFile + scope.row.文件标识 + '.' + scope.row.文件后缀) : readFile + '123.jpg'" style="width:23px;">
+                    <div slot="error" class="image-slot">
+                      <i class="el-icon-picture-outline"/>
+                    </div>
+                  </el-image>
+                </el-popover>
+                <span v-else>—</span>
+              </template>
+            </el-table-column>
            <el-table-column align="center" label="部门名称" width="100">
              <template slot-scope="scope">
                {{ scope.row.节点名称 }}
@@ -152,9 +175,10 @@
                {{ scope.row.家庭住址 }}
              </template>
            </el-table-column>
-            <el-table-column label="操作" fixed="right" align="center" width="300">
+            <el-table-column label="操作" fixed="right" align="center" width="220">
              <template slot-scope="scope">
                <el-button
+                  :disabled="scope.row.文件标识 && scope.row.文件标识 !== 'null'"
                  size="mini"
                  type="primary"
                  icon="el-icon-picture"
@@ -164,11 +188,11 @@
                  type="primary"
                  icon="el-icon-edit"
                  @click="handleEditPeople(scope.row)">编辑</el-button>
-                <el-button
-                  size="mini"
-                  type="danger"
-                  icon="el-icon-delete"
-                  @click="deletePeopleTable(scope.row)">删除</el-button>
+                  <!--<el-button-->
+                  <!--size="mini"-->
+                  <!--type="danger"-->
+                  <!--icon="el-icon-delete"-->
+                  <!--@click="deletePeopleTable(scope.row)">删除</el-button>-->
              </template>
            </el-table-column>
          </el-table>
@@ -415,9 +439,14 @@
 <script>
 import { moveGroups, getTree, tree, getTablePeople, getTablePeopleForName, addDepartmentName, delList, editList, delPeopleList, fetchEducationData, fetchPostData, addPeople, editPeople, quit, searchLeavingList } from '@/api/BasicData/PersonnelManagement'
 import { uploadPerson } from '@/utils/request'
+import { readFile } from '@/utils/request'
+import request from '@/utils/request'
+
 export default {
  data() {
    return {
+      limit: 999,
+      readFile: readFile,
      disabledMove: true,
      PageCurrentN: 1,
      PageSizeN: 10,
@@ -506,6 +535,35 @@ export default {
    this.fetchPostData()
  },
  methods: {
+    // 删除人员照片
+    deletePhoto(row) {
+      this.$confirm('此操作将永久删除该图片, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        request({
+          url: '',
+          method: 'post',
+          data: {
+            type: '4',
+            name: `delete from 人员管理_图片 where 人员编号 = ${row.人员编号}`
+          }
+        }).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('删除成功')
+            this.handleNodeClick()
+          } else {
+            this.$message.error('删除失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '取消删除'
+        })
+      })
+    },
    fetchEducationData() {
      this.getSelect(fetchEducationData, ['学历名称', '学历编号'], 'EducationDate')
    },
@@ -553,6 +611,7 @@ export default {
    uploadSuccess(res) { // 上传成功回调
      if (res[0].result === '1') {
        this.$message.success('增加成功')
+        this.handleNodeClick()
        this.dialogFormVisible = false
        this.$refs.upload.clearFiles()
      } else {
--- a/src/views/Inventory/CreatePickingList/index.vue
+++ b/src/views/Inventory/CreatePickingList/index.vue
@@ -529,7 +529,7 @@ export default {
    searchList() {
      let check, isElectrical
      this.pickingListNumber ? check = 1 : check = 0
-      Number(this.token) === 36 || Number(this.token) === 35 ? isElectrical = 1 : isElectrical = 0 // 35电工 36电气部长
+      Number(this.token) === 37 || Number(this.token) === 36 || Number(this.token) === 35 ? isElectrical = 1 : isElectrical = 0 // 35电工 36电气部长 37电气副部长
      searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListNumber, isElectrical).then(response => {
        this.pickListTable1 = response.data.rows
        this.total3 = response.data.total
@@ -556,7 +556,7 @@ export default {
    // 提交创建领料单
    submitCreateList() {
      let isElectrical
-      this.token === 36 || this.token === 35 ? isElectrical = 1 : isElectrical = 0 // 35电工 36电气部长
+      Number(this.token) === 37 || Number(this.token) === 36 || Number(this.token) === 35 ? isElectrical = 1 : isElectrical = 0 // 35电工 36电气部长 37电气副部长
      createList(this.form1.领料人流水号, this.form1.领料单备注, isElectrical).then(response => {
        if (response.data[0].result === '1') {
          this.$message.success('创建成功')
--- a/src/views/Inventory/PickingListApproval/index.vue
+++ b/src/views/Inventory/PickingListApproval/index.vue
@@ -32,8 +32,8 @@
        <el-table-column label="审批" align="center" min-width="90">
          <template slot-scope="scope">
            <el-tag v-if="Number(scope.row.是否审批)===1" type="success">已审批</el-tag>
-            <el-tag v-if="Number(scope.row.是否审批)===0 && Number(token)!==21 && Number(token)!==36" type="warning">未审批</el-tag>
-            <el-button v-if="Number(scope.row.是否审批)===0 && (Number(token)===21 || Number(token)===36)" size="mini" type="primary" plain icon="el-icon-check" @click="approvalPass(scope.row)">审批</el-button>
+            <el-tag v-if="Number(scope.row.是否审批)===0 && Number(token)!==21 && Number(token)!==36 && Number(token)!==37" type="warning">未审批</el-tag>
+            <el-button v-if="Number(scope.row.是否审批)===0 && (Number(token)===21 || Number(token)===36 || Number(token)===37)" size="mini" type="primary" plain icon="el-icon-check" @click="approvalPass(scope.row)">审批</el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -300,7 +300,7 @@ export default {
    searchList() {
      let check, isElectrical
      this.pickingListNumber ? check = 1 : check = 0
-      Number(this.token) === 36 || Number(this.token) === 35 ? isElectrical = 1 : isElectrical = 0 // 35电工 36电气部长
+      Number(this.token) === 37 || Number(this.token) === 36 || Number(this.token) === 35 ? isElectrical = 1 : isElectrical = 0 // 35电工 36电气部长 37电气副部长
      searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListNumber, isElectrical).then(response => {
        this.pickListTable1 = response.data.rows
        this.total3 = response.data.total
@@ -327,7 +327,7 @@ export default {
    // 提交创建领料单
    submitCreateList() {
      let isElectrical
-      this.token === 36 || this.token === 35 ? isElectrical = 1 : isElectrical = 0 // 35电工 36电气部长
+      Number(this.token) === 37 || Number(this.token) === 36 || Number(this.token) === 35 ? isElectrical = 1 : isElectrical = 0 // 35电工 36电气部长 37电气副部长
      createList(this.form1.领料人流水号, this.form1.领料单备注, isElectrical).then(response => {
        if (response.data[0].result === '1') {
          this.$message.success('创建成功')
--- a/src/views/ManufacturingCenter/AntonMonitoring/index.vue
+++ b/src/views/ManufacturingCenter/AntonMonitoring/index.vue
@@ -11,9 +11,31 @@
        height="800"
        highlight-current-row
        border>
+        <el-table-column align="center" label="照片" width="50">
+          <template slot-scope="scope">
+            <el-popover
+              v-if="scope.row.文件标识 && scope.row.文件标识 !== 'null'"
+              placement="top-start"
+              width="200"
+              trigger="hover">
+              <el-button type="text" style="float:right" @click="deletePhoto(scope.row)">删除</el-button>
+              <el-image :src="scope.row.文件标识 && scope.row.文件标识 !== 'null' ? (readFile + scope.row.文件标识 + '.' + scope.row.文件后缀) : readFile + '123.jpg'">
+                <div slot="error" class="image-slot">
+                  <i class="el-icon-picture-outline"/>
+                </div>
+              </el-image>
+              <el-image slot="reference" :src="scope.row.文件标识 && scope.row.文件标识 !== 'null' ? (readFile + scope.row.文件标识 + '.' + scope.row.文件后缀) : readFile + '123.jpg'" style="width:30px;">
+                <div slot="error" class="image-slot">
+                  <i class="el-icon-picture-outline"/>
+                </div>
+              </el-image>
+            </el-popover>
+            <span v-else>—</span>
+          </template>
+        </el-table-column>
        <el-table-column align="center" label="工位号">
          <template slot-scope="scope">
-            <el-button type="text">{{ scope.row.工位号 }}</el-button>
+            <el-button type="text" @click="openNew(scope.row.工位号)">{{ scope.row.工位号 }}</el-button>
          </template>
        </el-table-column>
        <el-table-column align="center" label="登陆人">
@@ -31,6 +53,7 @@
        <el-table-column label="操作" fixed="right" align="center" width="200">
          <template slot-scope="scope">
            <el-button
+              :disabled="scope.row.文件标识 && scope.row.文件标识 !== 'null'"
              size="mini"
              type="primary"
              icon="el-icon-picture"
@@ -93,9 +116,13 @@
 <script>
 import { ANDON_countselect } from '@/api/ManufacturingCenter/AntonMonitoring'
 import { wsuri, name1, uploadOP } from '@/utils/request'
+import { readFile } from '@/utils/request'
+import request from '@/utils/request'
 export default {
  data() {
    return {
+      readFile: readFile,
+      limit: 9999,
      tableData: [],
      timer_ANDON: '',
      andonMsg: '',
@@ -117,6 +144,37 @@ export default {
    this.initWebpack()
  },
  methods: {
+    deletePhoto(row) {
+      this.$confirm('此操作将永久删除该图片, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        request({
+          url: '',
+          method: 'post',
+          data: {
+            type: '4',
+            name: `delete from 设备管理_设备监控_图片 where 工位 = '${row.工位号}'`
+          }
+        }).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('删除成功')
+            this.ANDON_countselect()
+          } else {
+            this.$message.error('删除失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '取消删除'
+        })
+      })
+    },
+    openNew(val) {
+      window.open(`http://192.168.1.231:8008/#/EquipmentConditionAnalysis?opname=${val}`, '_blank')
+    },
    ANDON_countselect() {
      ANDON_countselect().then(response => {
        this.tableData = response.data
@@ -156,6 +214,7 @@ export default {
      if (res[0].result === '1') {
        this.$message.success('增加成功')
        this.dialogFormVisible = false
+        this.ANDON_countselect()
        this.$refs.upload.clearFiles()
      } else {
        this.$message.error('增加失败')