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

src/views/modules/eam/eamWorkOrderForCheck.vue

@@ -27,6 +27,7 @@
         <el-date-picker
           style="width: 120px"
           v-model="searchData.startDate"
+          :picker-options="pickerOptions"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="选择日期">
@@ -39,6 +40,7 @@
         <el-date-picker
           style="width: 120px"
           v-model="searchData.endDate"
+          :picker-options="pickerOptions"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="选择日期">
@@ -136,6 +138,7 @@
         </template>
       </el-table-column>
     </el-table>
+
     <el-pagination
       @size-change="sizeChangeHandle"
       @current-change="currentChangeHandle"
@@ -145,6 +148,7 @@
       :total="totalPage"
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
+
     <el-dialog title="执行结果" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="830px">
       <el-form :inline="true" label-position="top" >
         <el-form-item :label="'工厂编码'">
@@ -711,7 +715,13 @@
           difficultyRemark: '',
           status: ''
         },
-        submitModelFlag: false
+        submitModelFlag: false,
+        // 日期限制
+        pickerOptions: {
+          disabledDate(time) {
+            return time.getTime() > Date.now();
+          },
+        },
       }
     },
     mounted () {

src/views/modules/eam/eamWorkOrderForMaintenance.vue

@@ -27,6 +27,7 @@
         <el-date-picker
           style="width: 120px"
           v-model="searchData.startDate"
+          :picker-options="pickerOptions"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="选择日期">
@@ -39,6 +40,7 @@
         <el-date-picker
           style="width: 120px"
           v-model="searchData.endDate"
+          :picker-options="pickerOptions"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="选择日期">
@@ -117,6 +119,7 @@
         </template>
       </el-table-column>
     </el-table>
+
     <el-pagination
       @size-change="sizeChangeHandle"
       @current-change="currentChangeHandle"
@@ -741,7 +744,13 @@
           difficultyLevel: '',
           difficultyRemark: ''
         },
-        submitModelFlag: false
+        submitModelFlag: false,
+        // 日期限制
+        pickerOptions: {
+          disabledDate(time) {
+            return time.getTime() > Date.now();
+          },
+        },
       }
     },
     mounted () {

src/views/modules/eam/eamWorkPlanForCheck.vue

@@ -146,7 +146,7 @@
           <el-date-picker
             style="width: 120px"
             v-model="modalData.planStartDate"
-            type="datetime"
+            type="date"
             value-format="yyyy-MM-dd"
             format='yyyy-MM-dd'
             placeholder="必选"
@@ -158,7 +158,7 @@
           <el-date-picker
             style="width: 120px"
             v-model="modalData.planEndDate"
-            type="datetime"
+            type="date"
             value-format="yyyy-MM-dd"
             format='yyyy-MM-dd'
             placeholder="必选"
@@ -166,16 +166,20 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="点检周期(天):" prop="planPeriod" :rules="rules.planPeriodType">
+        <el-form-item label="点检频率:" prop="planPeriod" :rules="rules.planPeriodType">
           <el-input v-model="modalData.planPeriod" type="number" onkeyup="value=value.replace(/^[^\d]+/g,'')" style="width: 120px"></el-input>
         </el-form-item>
-        <el-form-item label="备注:">
-          <el-input v-model="modalData.remark" style="width: 120px"></el-input>
+        <el-form-item label="点检周期">
+          <el-select filterable v-model="modalData.planCycle" style="width: 50px">
+            <el-option label="天" value="天"></el-option>
+            <el-option label="周" value="周"></el-option>
+            <el-option label="月" value="月"></el-option>
+            <el-option label="年" value="年"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="周末:">
+          <input type="checkbox" value="A" name="addWorkOrderRule" v-model="modalData.workOrderRule"/>
         </el-form-item>
-<!--        <el-form-item label="' '">-->
-<!--&lt;!&ndash;          <el-input v-model="modalData.remark" style="width: 120px">周末</el-input>&ndash;&gt;-->
-<!--          <input type="radio" value="0" v-model="sex">周末-->
-<!--        </el-form-item>-->
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 0px;">
         <el-form-item prop="operatorName" :rules="rules.operatorNameType">
@@ -187,11 +191,11 @@
           <el-input v-model="modalData.checkerName" style="width: 255px"></el-input>
         </el-form-item>
       </el-form>
-<!--      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 0px;">-->
-<!--        <el-form-item label="备注:">-->
-<!--          <el-input v-model="modalData.remark" style="width: 525px"></el-input>-->
-<!--        </el-form-item>-->
-<!--      </el-form>-->
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 0px;">
+        <el-form-item label="备注:">
+          <el-input v-model="modalData.remark" style="width: 525px"></el-input>
+        </el-form-item>
+      </el-form>
         <div style="text-align: center ;font-size: 11px">
           <span> ----------------------------------------------------选择设备----------------------------------------------------</span>
         </div>
@@ -295,8 +299,8 @@
         <el-form-item label="点检周期(天):" prop="planPeriod" :rules="rules.planPeriodType">
           <el-input v-model="modalData.planPeriod" type="number" onkeyup="value=value.replace(/^[^\d]+/g,'')" style="width: 120px"></el-input>
         </el-form-item>
-        <el-form-item label="备注:">
-          <el-input v-model="modalData.remark" style="width: 120px"></el-input>
+        <el-form-item label="周末(选中周末排单):">
+          <input type="checkbox" value="A" name="updateWorkOrderRule" v-model="modalData.workOrderRule"/>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 0px;">
@@ -308,6 +312,11 @@
           <span slot="label" style="" @click="getCheckerList()"><a>选择审核人员</a></span>
           <el-input v-model="modalData.checkerName" style="width: 255px"></el-input>
         </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 0px;">
+        <el-form-item label="备注:">
+          <el-input v-model="modalData.remark" style="width: 525px"></el-input>
+        </el-form-item>
       </el-form>
         <div style="text-align: center ;font-size: 11px">
           <span> ----------------------------------------------------选择设备----------------------------------------------------</span>
@@ -797,6 +806,8 @@
           updateBy:this.$store.state.user.name,
           userId:'',
           remark:'',
+          workOrderRule:'',
+          planCycle: ''
         },
         objectData:{
           site: this.$store.state.user.site,
@@ -1525,6 +1536,10 @@
             return time < this.dayjs().format("yyyy-MM-dd");
           },
         },
+        message: {
+          name:"周末",
+          id:'A'
+        },
       }
     },
     mounted () {
@@ -1879,27 +1894,29 @@
       addModal(){
         this.modalData={
           flag: '1',
-          objectList:[],
-          functionType:'A',
+          objectList: [],
+          functionType: 'A',
           site: this.$store.state.user.site,
-          planID:'',
-          planDesc:'',
-          objectID:'',
-          objectDesc:'',
-          propertiesCode:'',
-          propertiesDesc:'',
-          operator:'',
-          operatorName:'',
+          planID: '',
+          planDesc: '',
+          objectID: '',
+          objectDesc: '',
+          propertiesCode: '',
+          propertiesDesc: '',
+          operator: '',
+          operatorName: '',
           checker: '',
           checkerName: '',
-          planPeriod:'',
-          status:'',
-          planStartDate:'',
-          planEndDate:'',
-          userId:this.$store.state.user.name,
-          createdBy:this.$store.state.user.name,
-          updateBy:this.$store.state.user.name,
-          remark:'',
+          planPeriod: '',
+          status: '',
+          planStartDate: '',
+          planEndDate: '',
+          userId: this.$store.state.user.name,
+          createdBy: this.$store.state.user.name,
+          updateBy: this.$store.state.user.name,
+          remark: '',
+          workOrderRule: '',
+          planCycle: '天'
         };
         this.modalDisableFlag = false;
         this.objectList = [];
@@ -1929,11 +1946,16 @@
           createdBy:this.$store.state.user.name,
           updateBy:this.$store.state.user.name,
           remark: row.remark,
+          workOrderRule: row.workOrderRule,
+          planCycle: row.planCycle
         };
         this.updateObjectList = [];
         this.updateDetailData = {}
         this.updateDetailData.site = row.site
         this.updateDetailData.planID = row.planID
+        if (this.modalData.workOrderRule != null && this.modalData.workOrderRule.split(",").includes('A')){
+          this.modalData.workOrderRule = 'A'
+        }
         getPlanDetailList(this.updateDetailData).then(({data}) => {
           if (data && data.code === 0) {
             this.updateObjectList = data.rows
@@ -2041,6 +2063,15 @@
             return false
           }
           this.modalData.objectList = this.dataListSelections
+          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.workOrderRule = s
           eamWorkPlanSave(this.modalData).then(({data}) => {
             if (data && data.code === 0) {
               this.getDataList()
@@ -2060,6 +2091,15 @@
           })
         }else {
           this.modalData.objectList = this.updateObjectList
+          let obj = document.getElementsByName('updateWorkOrderRule');
+          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.workOrderRule = s
           eamWorkPlanEdit(this.modalData).then(({data}) => {
             if (data && data.code === 0) {
               this.getDataList()
@@ -2106,7 +2146,6 @@
         })
       },
       updateItemModal(row){
-        console.log(row)
         this.itemModalData={
           flag: '2',
           site: row.site,
@@ -2310,7 +2349,7 @@
           type: 'warning'
         }).then(() => {
           createEamWorkOrder(tempData).then(({data}) => {
-            if (data && data.code ==0) {
+            if (data && data.code === 0) {
               this.getDataList()
               this.$message({
                 message: '操作成功',
@@ -2419,7 +2458,6 @@
           userId: this.$store.state.user.id,
           languageCode: this.$i18n.locale
         }
-        console.log(this.$route.meta.menuId)
         userFavoriteList(userFavorite).then(({data}) => {
           for (let i = 0; i < data.list.length; i++) {
             if(this.$route.meta.menuId==data.list[i].menuId){

src/views/modules/eam/eamWorkPlanForMaintenance.vue

@@ -150,8 +150,8 @@
       <el-form-item label="维保周期(天):" prop="planPeriod" :rules="rules.planPeriodType">
         <el-input v-model="modalData.planPeriod" type="number" onkeyup="value=value.replace(/^[^\d]+/g,'')" style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item label="备注:">
-        <el-input v-model="modalData.remark" style="width: 120px"></el-input>
+      <el-form-item label="周末(选中周末排单):">
+        <input type="checkbox" value="A" name="addWorkOrderRule" v-model="modalData.workOrderRule"/>
       </el-form-item>
     </el-form>
     <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 0px;">
@@ -164,6 +164,11 @@
         <el-input v-model="modalData.checkerName" style="width: 255px"></el-input>
       </el-form-item>
     </el-form>
+    <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 0px;">
+      <el-form-item label="备注:">
+        <el-input v-model="modalData.remark" style="width: 525px"></el-input>
+      </el-form-item>
+    </el-form>
     <div style="text-align: center ;font-size: 11px">
       <span> ----------------------------------------------------选择设备----------------------------------------------------</span>
     </div>
@@ -267,8 +272,8 @@
         <el-form-item label="点检周期(天):" prop="planPeriod" :rules="rules.planPeriodType">
           <el-input v-model="modalData.planPeriod" type="number" onkeyup="value=value.replace(/^[^\d]+/g,'')" style="width: 120px"></el-input>
         </el-form-item>
-        <el-form-item label="备注:">
-          <el-input v-model="modalData.remark" style="width: 120px"></el-input>
+        <el-form-item label="周末(选中周末排单):">
+          <input type="checkbox" value="A" name="updateWorkOrderRule" v-model="modalData.workOrderRule"/>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 0px;">
@@ -281,6 +286,11 @@
           <el-input v-model="modalData.checkerName" style="width: 255px"></el-input>
         </el-form-item>
       </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 0px;">
+        <el-form-item label="备注:">
+          <el-input v-model="modalData.remark" style="width: 525px"></el-input>
+        </el-form-item>
+      </el-form>
       <div style="text-align: center ;font-size: 11px">
         <span> ----------------------------------------------------选择设备----------------------------------------------------</span>
       </div>
@@ -783,6 +793,7 @@
           planEndDate:'',
           userId:'',
           remark:'',
+          workOrderRule: ''
         },
         objectData:{
           site: this.$store.state.user.site,
@@ -1842,6 +1853,7 @@
           createdBy:this.$store.state.user.name,
           updateBy:this.$store.state.user.name,
           remark:'',
+          workOrderRule: ''
         };
         this.modalDisableFlag = false;
         this.objectList = [];
@@ -1871,11 +1883,15 @@
           createdBy:this.$store.state.user.name,
           updateBy:this.$store.state.user.name,
           remark:row.remark,
+          workOrderRule: row.workOrderRule
         };
-        this.updateObjectList = [];
+        this.updateObjectList = []
         this.updateDetailData = {}
         this.updateDetailData.site = row.site
         this.updateDetailData.planID = row.planID
+        if (this.modalData.workOrderRule.split(",").includes('A')){
+          this.modalData.workOrderRule = 'A'
+        }
         getPlanDetailList(this.updateDetailData).then(({data}) => {
           if (data && data.code === 0) {
             this.updateObjectList = data.rows
@@ -1982,6 +1998,15 @@
             return false
           }
           this.modalData.objectList=this.dataListSelections
+          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.workOrderRule = s
           eamWorkPlanSave(this.modalData).then(({data}) => {
             if (data && data.code === 0) {
               this.getDataList()
@@ -2001,6 +2026,15 @@
           })
         }else {
           this.modalData.objectList = this.updateObjectList
+          let obj = document.getElementsByName('updateWorkOrderRule');
+          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.workOrderRule = s
           eamWorkPlanEdit(this.modalData).then(({data}) => {
             if (data && data.code === 0) {
               this.getDataList()

src/views/modules/qc/qcPartAttribute.vue

@@ -463,7 +463,7 @@
     </el-dialog>
 
     <!-- 供应商 -->
-    <el-dialog title="供应商清单" :close-on-click-modal="false" v-drag :visible.sync="manufacturerModelFlag" width="420px">
+    <el-dialog title="供应商清单" :close-on-click-modal="false" v-drag :visible.sync="manufacturerModelFlag" width="520px">
       <div class="rq">
         <el-form :inline="true" label-position="top" :model="manufacturerData">
           <el-form-item :label="'供应商编码:'">
@@ -1167,7 +1167,7 @@
 
       // 添加模板
       addItem(){
-        if(this.itemSelections1 == null || this.itemSelections1.length == 0){
+        if(this.itemSelections1 == null || this.itemSelections1.length === 0){
           this.$alert("请选择可选模板！", '提示', {
             confirmButtonText: '确定'
           })
@@ -1197,7 +1197,7 @@
       },
       // 删除模板
       deleteItem(){
-        if(this.itemSelections2 == null || this.itemSelections2.length == 0){
+        if(this.itemSelections2 == null || this.itemSelections2.length === 0){
           this.$alert("请选择已有模板！", '提示', {
             confirmButtonText: '确定'
           })

src/views/modules/reportWorkOrder/reportCheckOrder.vue

@@ -22,6 +22,7 @@
         <el-date-picker
           style="width: 120px"
           v-model="searchData.startDate"
+          :picker-options="pickerOptions"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="选择日期">
@@ -34,6 +35,7 @@
         <el-date-picker
           style="width: 120px"
           v-model="searchData.endDate"
+          :picker-options="pickerOptions"
           type="date"
           value-format="yyyy-MM-dd"
           placeholder="选择日期">
@@ -957,6 +959,12 @@
             columnWidth: 70,
           },
         ],
+        // 日期限制
+        pickerOptions: {
+          disabledDate(time) {
+            return time.getTime() > Date.now();
+          },
+        },
       }
     },
     mounted () {
@@ -977,7 +985,7 @@
         }
         userFavoriteList(userFavorite).then(({data}) => {
           for (let i = 0; i < data.list.length; i++) {
-            if(this.$route.meta.menuId==data.list[i].menuId){
+            if(this.$route.meta.menuId == data.list[i].menuId){
               this.favorite = true
             }
           }
@@ -1029,7 +1037,7 @@
         this.searchData.limit = this.pageSize
         this.searchData.page = this.pageIndex
         eamWorkOrderSearch(this.searchData).then(({data}) => {
-          if (data.code == 0) {
+          if (data.code === 0) {
             this.dataList = data.page.list
             this.pageIndex = data.page.currPage
             this.pageSize = data.page.pageSize
@@ -1113,25 +1121,25 @@
       },
 
       async saveCheckReport(){
-        if(this.saveData.checkResult == ''|| this.saveData.checkResult == null){
+        if(this.saveData.checkResult === ''|| this.saveData.checkResult == null){
           this.$alert('请选择点检结论！', '错误', {
             confirmButtonText: '确定'
           })
           return false
         }
-        if(this.saveData.startDate == ''|| this.saveData.startDate == null){
+        if(this.saveData.startDate === ''|| this.saveData.startDate == null){
           this.$alert('请输入开始时间！', '错误', {
             confirmButtonText: '确定'
           })
           return false
         }
-        if(this.saveData.endDate == ''|| this.saveData.endDate == null){
+        if(this.saveData.endDate === ''|| this.saveData.endDate == null){
           this.$alert('请输入结束时间！', '错误', {
             confirmButtonText: '确定'
           })
           return false
         }
-        if(this.saveData.workTime == 0){
+        if(this.saveData.workTime === 0){
           this.$alert('工作时长不能为0！', '错误', {
             confirmButtonText: '确定'
           })