2023-07-31 设备和质量修改

3 years ago · 8f2b6f76d7
10 changed files with 115 additions and 76 deletions
--- a/src/views/modules/eam/com_eam_object_add_update.vue
+++ b/src/views/modules/eam/com_eam_object_add_update.vue
@ -76,7 +76,7 @@
        </el-row>
        <el-row>
          <el-col :span="12">
-            <el-form-item class="customer-item" prop="resourceDesc" :rules="rules.resourceType">
+            <el-form-item class="customer-item" prop="resourceDesc">
              <span slot="label" style="" @click="getBaseList(203)"><a herf="#">机台编号:</a></span>
              <el-input v-model="pageData.resourceDesc" style="width: 120px;" ></el-input>
            </el-form-item>
@ -193,13 +193,6 @@ export default {
            trigger: 'change'
          }
        ],
-        resourceType:[
-          {
-            required: true,
-            message: ' ',
-            trigger: 'change'
-          }
-        ],
        deptType:[
          {
            required: true,
@ -226,7 +219,7 @@ export default {
      //打开页面
      this.visible = true;
      //判断是否是新增
-      if(this.pageData.addFlag == 'Y'){
+      if(this.pageData.addFlag === 'Y'){
        this.readOnlyFlag = false;
      }else{
        this.readOnlyFlag = true;
@ -272,10 +265,10 @@ export default {
        this.$message.success("分类不能为空!");
        return false;
      }
-      if(this.pageData.resourceID == null || this.pageData.resourceID === ''){
-        this.$message.success("机台不能为空!");
-        return false;
-      }
+      // if(this.pageData.resourceID == null || this.pageData.resourceID === ''){
+      //   this.$message.success("机台不能为空!");
+      //   return false;
+      // }
      if(this.pageData.deptID == null || this.pageData.deptID === ''){
        this.$message.success("所属部门不能为空!");
        return false;
@ -299,7 +292,6 @@ export default {
      if (this.pageData.site == '通用设备'){
        this.pageData.site = '4'
      }
-
      insertEamObject(this.pageData).then(({data}) => {
        if(data.code == 200){
          this.$message.success(data.msg);
--- a/src/views/modules/eam/eamPropertiesItem.vue
+++ b/src/views/modules/eam/eamPropertiesItem.vue
@ -93,17 +93,6 @@
          </el-select>
        </el-form-item>
      </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item label="点检方法说明:">
-          <el-input v-model="modalData.itemRemark" style="width: 254px"></el-input>
-        </el-form-item>
-        <el-form-item :label="'是否值可选'" prop="valueChooseFlag" :rules="rules.valueChooseFlagType">
-          <el-select filterable v-model="modalData.valueChooseFlag" style="width: 120px">
-            <el-option label="是" value="Y"></el-option>
-            <el-option label="否" value="N"></el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
        <el-form-item label="参照值:">
          <el-input v-model="modalData.defaultValue" style="width: 120px"></el-input>
@ -115,6 +104,20 @@
          <el-input v-model="modalData.minValue" type="number" style="width: 120px"></el-input>
        </el-form-item>
      </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="点检方法说明:">
+          <el-input v-model="modalData.itemRemark" style="width: 224px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'是否值可选'" prop="valueChooseFlag" :rules="rules.valueChooseFlagType">
+          <el-select v-model="modalData.valueChooseFlag" style="width: 80px">
+            <el-option label="是" value="Y"></el-option>
+            <el-option label="否" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="图片必填:">
+          <input type="checkbox" value="Y" name="addWorkOrderRule" v-model="modalData.imageFlag"/>
+        </el-form-item>
+      </el-form>
      <el-footer style="height:40px;margin-top: 20px;text-align:center">
        <el-button type="primary" @click="saveData()">保存</el-button>
        <el-button type="primary" @click="modalFlag = false">关闭</el-button>
@ -265,6 +268,7 @@
          itemRemark:'',
          itemType:'A',
          updateBy: this.$store.state.user.name,
+          imageFlag: ''
        },
        departmentList:[],
        // 展示列集
@ -405,6 +409,23 @@
            status: true,
            fixed: '',
          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101008,
+            serialNumber: '101008TableValueChooseFlag',
+            tableId: "101008Table",
+            tableName: "common",
+            columnProp: 'imageFlag',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '是否图片必填',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
          {
            userId: this.$store.state.user.name,
            functionId: 101008,
@ -613,7 +634,7 @@
      },

      addModal(){
-        this.modalData={
+        this.modalData = {
          flag:'1',
          itemNo:'',
          itemDesc:'',
@ -626,9 +647,10 @@
          itemRemark:'',
          itemType:'A',
          updateBy: this.$store.state.user.name,
+          imageFlag: ''
        };
-        this.modalDisableFlag=false;
-        this.modalFlag=true;
+        this.modalDisableFlag = false;
+        this.modalFlag = true;
      },
      chooseModal(row){
        this.chooseModalData.itemNo=row.itemNo;
@ -640,22 +662,23 @@
        this.chooseModalFlag=true;
      },
      updateModal(row){
-        this.modalData={
-          flag:'2',
-          itemNo:row.itemNo,
-          itemDesc:row.itemDesc,
-          valueTypeDb:row.valueTypeDb,
-          defaultValue:row.defaultValue,
-          valueChooseFlag:row.valueChooseFlag,
-          createdBy:this.$store.state.user.name,
-          maxValue:row.maxValue,
-          minValue:row.minValue,
-          itemRemark:row.itemRemark,
-          itemType:'A',
+        this.modalData = {
+          flag: '2',
+          itemNo: row.itemNo,
+          itemDesc: row.itemDesc,
+          valueTypeDb: row.valueTypeDb,
+          defaultValue: row.defaultValue,
+          valueChooseFlag: row.valueChooseFlag,
+          createdBy: this.$store.state.user.name,
+          maxValue: row.maxValue,
+          minValue: row.minValue,
+          itemRemark: row.itemRemark,
+          itemType: 'A',
          updateBy: this.$store.state.user.name,
+          imageFlag: row.imageFlag
        };
-        this.modalDisableFlag=true;
-        this.modalFlag=true;
+        this.modalDisableFlag = true;
+        this.modalFlag = true;
      },
      // 删除
      deleteEamPropertiesItem (row) {
@ -684,23 +707,32 @@
        })
      },
      saveData(){
-        if (this.modalData.itemNo == '' || this.modalData.itemNo == null) {
+        if (this.modalData.itemNo === '' || this.modalData.itemNo == null) {
          this.$alert('请输入点检项目编码！', '错误', {
            confirmButtonText: '确定'
          })
          return false
        }
-        if (this.modalData.itemDesc == '' || this.modalData.itemDesc == null) {
+        if (this.modalData.itemDesc === '' || this.modalData.itemDesc == null) {
          this.$alert('请输入点检项目名称！', '错误', {
            confirmButtonText: '确定'
          })
          return false
        }
-        if(this.modalData.flag=='1'){
+        let obj = document.getElementsByName('addWorkOrderRule');
+        let s = '';
+        for (let i = 0; i < obj.length; i++) {
+          if (obj[i].checked) {
+            s += obj[i].value + ',';
+          }
+        }
+        s = s.substring(0,s.length-1)
+        this.modalData.imageFlag = s
+        if(this.modalData.flag === '1'){
          eamPropertiesItemSave(this.modalData).then(({data}) => {
            if (data && data.code === '0') {
              this.getDataList()
-              this.modalFlag=false
+              this.modalFlag = false
              this.$message({
                message: '操作成功',
                type: 'success',
@ -718,7 +750,7 @@
          eamPropertiesItemEdit(this.modalData).then(({data}) => {
            if (data && data.code === '0') {
              this.getDataList()
-              this.modalFlag=false
+              this.modalFlag = false
              this.$message({
                message: '操作成功',
                type: 'success',
--- a/src/views/modules/eam/eamWorkPlanForCheck.vue
+++ b/src/views/modules/eam/eamWorkPlanForCheck.vue
@ -737,7 +737,7 @@
    getObjList, // 获取设备的差异列表(快速新增)
    addObject, // 添加设备
    delObject, // 移除设备
-    planObjectSearch, 查询该计划的设备
+    planObjectSearch, // 查询该计划的设备
  } from "@/api/eam/eam.js"
  import Chooselist from '@/views/modules/common/Chooselist_eam'
  import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
--- a/src/views/modules/eam/eam_device_list.vue
+++ b/src/views/modules/eam/eam_device_list.vue
@ -223,6 +223,7 @@
          </el-table-column>
        </el-table>
      </el-tab-pane>
+
      <!-- 设备备件 -->
      <el-tab-pane label="设备备件" name="device_part">
        <el-form :inline="true" label-position="top" style="margin-top: 5px">
@ -262,6 +263,7 @@
          </el-table-column>
        </el-table>
      </el-tab-pane>
+
      <!-- 点检项目 -->
      <el-tab-pane label="点检项目" name="check_item">
        <el-form :inline="true" label-position="top" style="margin-top: 5px">
--- a/src/views/modules/qc/qcTemplate.vue
+++ b/src/views/modules/qc/qcTemplate.vue
@ -910,8 +910,6 @@
        document.activeElement.blur()
      },

-
-
      // 清空搜索栏
      doEmpty(){
        this.searchData = {
--- a/src/views/modules/reportWorkOrder/com_eam_itemImage_upload_file.vue
+++ b/src/views/modules/reportWorkOrder/com_eam_itemImage_upload_file.vue
@ -26,15 +26,13 @@
            </el-upload>
          </el-col>
        </el-row>
-        <el-row>
-          <el-col :span="24" style="margin-bottom: 30px;">
-            <el-form-item class="customer-item" label="备注:" >
-              <el-input type="textarea" style="width: 360px;" placeholder="请输入内容" v-model="pageData.fileRemark"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-        </el-row>
+<!--        <el-row>-->
+<!--          <el-col :span="24" style="margin-bottom: 30px;">-->
+<!--            <el-form-item class="customer-item" label="备注:" >-->
+<!--              <el-input type="textarea" style="width: 360px;" placeholder="请输入内容" v-model="pageData.fileRemark"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
      </el-form>
      <span slot="footer" class="dialog-footer">
        <el-button type="primary" @click="saveUploadFile()">保存</el-button>
@ -45,9 +43,7 @@
 </template>

 <script>
-import {
-  uploadEamObjectFile,
-} from '@/api/eam/com_eam_object_upload_file.js';
+import {uploadEamObjectFile} from '@/api/eam/com_eam_object_upload_file.js';

 /* 引入组件 */
 var functionId = 'C10000002';
@ -66,6 +62,7 @@ export default {
        functionType: '',
        itemNo: '',
        fileRemark: '',
+        folder: ''
      },
      dataListLoading: false,
    }
@ -107,7 +104,7 @@ export default {
        remark = ''
      }
      /*判断文件是否上传*/
-      if(null == this.fileList || 0 == this.fileList.length){
+      if(null == this.fileList || 0 === this.fileList.length){
        this.$message.error("请先上传文件!");
        return false;
      }
@ -115,8 +112,9 @@ export default {
      //片接文件
      formData.append("file", this.fileList[0].raw);
      formData.append("site", this.pageData.site);
-      formData.append("objectID", this.pageData.inspectionNo);
-      formData.append("remark", remark);
+      formData.append("folder", this.pageData.folder);
+      formData.append("objectID", this.pageData.orderNo);
+      formData.append("orderRef1", this.pageData.itemNo);
      uploadEamObjectFile(formData).then(({data}) => {
        if (data.code === 0) {
          this.$message.success(data.msg);
--- a/src/views/modules/reportWorkOrder/reportCheckOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportCheckOrder.vue
@ -161,10 +161,10 @@
                prop=""
                header-align="center"
                align="center"
-                min-width="60"
+                min-width="40"
                label="操作">
                <template slot-scope="scope">
-                  <el-button type="primary" @click="addUploadFileModal(scope.row)">上传图片</el-button>
+                  <el-button class="el-icon-upload" type="primary" @click="addUploadFileModal(scope.row)"></el-button>
                </template>
              </el-table-column>
              <el-table-column
@ -762,6 +762,24 @@
            fixed: '',
            columnWidth: 70,
          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 101019,
+            serialNumber: '101019Table2MinValue',
+            tableId: "101019Table2",
+            tableName: "点检项目表",
+            columnProp: 'imageFlag',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '图片必填',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 70,
+          }
        ],
        HistoryRecordList: [],
        HistoryModelFlag: false,
@ -1310,14 +1328,13 @@
          orderNo: this.saveData.orderNo,
          functionType: 'A',
          itemNo: row.itemNo,
+          folder: 'itemImageFile'
        };
        //打开组件 去做新增业务
        this.$nextTick(() => {
          this.$refs.comEamItemImageUploadFile.init(currentData);
        })
      },
-
-
    }
  }
 </script>