首道工序扫描卷 2022年12月7日 sxm

config/index.js

@@ -13,7 +13,7 @@ module.exports = {
     // 代理列表, 是否开启代理通过[./dev.env.js]配置
     proxyTable: devEnv.OPEN_PROXY === false ? {} : {
       '/proxyApi': {
-        target: 'http://127.0.0.1:9090',
+        target: 'http://192.168.1.83:9091',
         changeOrigin: true,
         pathRewrite: {
           // 把 /proxyApi 替换成 /

src/api/yieldReport/com_produce_material.js

@@ -8,3 +8,6 @@ export const feedingMaterialRoll = data => createAPI('schedule/feedingMaterialRo
 
 
 export const scannerMaterial = data => createAPI('schedule/scannerMaterial', 'POST', data)
+
+
+export const getBomItemNosByKeyPartNo = data => createAPI('schedule/getBomItemNosByKeyPartNo', 'POST', data)

src/views/common/home.vue

@@ -26,7 +26,7 @@
     computed: {
       userName: {
         get() {
-          return this.$store.state.user.name
+          return this.$store.state.user.userDisplay
         }
       },
       mainTabs: {

src/views/modules/base/calendar.vue

@@ -462,7 +462,7 @@
           </el-time-picker>
         </el-form-item>
         <el-form-item :label="'休息时长1：'">
-          <el-input v-model="workingCalendar.exceptduration1" style="width: 130px"></el-input>
+          <el-input v-model="workingCalendar.exceptduration1" @change="workTimeSum" style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label="'休息时间点2：'">
           <el-time-picker
@@ -474,7 +474,7 @@
           </el-time-picker>
         </el-form-item>
         <el-form-item :label="'休息时长2：'">
-          <el-input v-model="workingCalendar.exceptduration2" style="width: 130px"></el-input>
+          <el-input v-model="workingCalendar.exceptduration2" @change="workTimeSum" style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label="'休息时间点3：'">
           <el-time-picker
@@ -486,7 +486,7 @@
           </el-time-picker>
         </el-form-item>
         <el-form-item :label="'休息时长3：'">
-          <el-input v-model="workingCalendar.exceptduration3" style="width: 130px"></el-input>
+          <el-input v-model="workingCalendar.exceptduration3" @change="workTimeSum" style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label="'休息时间点4：'">
           <el-time-picker
@@ -498,7 +498,7 @@
           </el-time-picker>
         </el-form-item>
         <el-form-item :label="'休息时长4：'">
-          <el-input v-model="workingCalendar.exceptduration4" style="width: 130px"></el-input>
+          <el-input v-model="workingCalendar.exceptduration4" @change="workTimeSum" style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label="'休息时间点5：'">
           <el-time-picker
@@ -510,7 +510,7 @@
           </el-time-picker>
         </el-form-item>
         <el-form-item :label="'休息时长5：'">
-          <el-input v-model="workingCalendar.exceptduration5" style="width: 130px"></el-input>
+          <el-input v-model="workingCalendar.exceptduration5" @change="workTimeSum" style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label="'休息时间点6：'">
           <el-time-picker
@@ -522,10 +522,10 @@
           </el-time-picker>
         </el-form-item>
         <el-form-item :label="'休息时长6：'">
-          <el-input v-model="workingCalendar.exceptduration6" style="width: 130px"></el-input>
+          <el-input v-model="workingCalendar.exceptduration6" @change="workTimeSum" style="width: 130px"></el-input>
         </el-form-item>
-        <el-form-item :label="'备注：'">
-          <el-input v-model="workingCalendar.remark" style="width: 275px"></el-input>
+        <el-form-item :label="'累计工作时间：'">
+          <el-input v-model="workingCalendar.worktime" disabled style="width: 275px"></el-input>
         </el-form-item>
       </el-form>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
@@ -1238,8 +1238,8 @@ export default {
         let list = data.rows;
         if (list.length > 0) {
           for (let i = 0; i < list.length; i++) {
-            for ( let f = 0; f < this.maintainColumnList2.length ; f++ ){
-              list[i][this.maintainColumnList2[f].columnProp]  = this.maintainCalendarSearchData.datetype;
+            for (let f = 0; f < this.maintainColumnList2.length; f++) {
+              list[i][this.maintainColumnList2[f].columnProp] = this.maintainCalendarSearchData.datetype;
             }
           }
         }
@@ -1546,6 +1546,12 @@ export default {
 
       })
     },
+    workTimeSum() {
+      let durationTime = parseFloat(this.workingCalendar.exceptduration1 || 0) + parseFloat(this.workingCalendar.exceptduration2 || 0) + parseFloat(this.workingCalendar.exceptduration3 || 0)
+        + parseFloat(this.workingCalendar.exceptduration4 || 0) + parseFloat(this.workingCalendar.exceptduration5 || 0) + parseFloat(this.workingCalendar.exceptduration6 || 0)
+
+      this.workingCalendar.worktime = 24 - durationTime
+    },
     // 保存修改后的班次信息
     updateWorkingCalendar() {
       this.workingCalendar.excepttime1 = parseInt(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime1 + ':00').format('H'))
@@ -1560,6 +1566,12 @@ export default {
         + parseFloat(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime5 + ':00').format('mm')) / 60
       this.workingCalendar.excepttime6 = parseInt(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime6 + ':00').format('H'))
         + parseFloat(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime6 + ':00').format('mm')) / 60
+
+      let durationTime = parseFloat(this.workingCalendar.exceptduration1 || 0) + parseFloat(this.workingCalendar.exceptduration2 || 0) + parseFloat(this.workingCalendar.exceptduration3 || 0)
+        + parseFloat(this.workingCalendar.exceptduration4 || 0) + parseFloat(this.workingCalendar.exceptduration5 || 0) + parseFloat(this.workingCalendar.exceptduration6 || 0)
+
+      this.workingCalendar.worktime = 24 - durationTime
+
       updateWorkingCalendar(this.workingCalendar).then(({data}) => {
         if (data && data.code == 0) {
           this.$message.success(data.msg)

src/views/modules/common/com_work_calendar_out.vue

@@ -82,7 +82,7 @@
           </el-time-picker>
         </el-form-item>
         <el-form-item :label="'休息时长1：'">
-          <el-input v-model="workingCalendar.exceptduration1" style="width: 130px"></el-input>
+          <el-input v-model="workingCalendar.exceptduration1" @change="workTimeSum"  style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label="'休息时间点2：'">
           <el-time-picker
@@ -94,7 +94,7 @@
           </el-time-picker>
         </el-form-item>
         <el-form-item :label="'休息时长2：'">
-          <el-input v-model="workingCalendar.exceptduration2" style="width: 130px"></el-input>
+          <el-input v-model="workingCalendar.exceptduration2" @change="workTimeSum"  style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label="'休息时间点3：'">
           <el-time-picker
@@ -106,7 +106,7 @@
           </el-time-picker>
         </el-form-item>
         <el-form-item :label="'休息时长3：'">
-          <el-input v-model="workingCalendar.exceptduration3" style="width: 130px"></el-input>
+          <el-input v-model="workingCalendar.exceptduration3" @change="workTimeSum"  style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label="'休息时间点4：'">
           <el-time-picker
@@ -118,7 +118,7 @@
           </el-time-picker>
         </el-form-item>
         <el-form-item :label="'休息时长4：'">
-          <el-input v-model="workingCalendar.exceptduration4" style="width: 130px"></el-input>
+          <el-input v-model="workingCalendar.exceptduration4" @change="workTimeSum"  style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label="'休息时间点5：'">
           <el-time-picker
@@ -130,7 +130,7 @@
           </el-time-picker>
         </el-form-item>
         <el-form-item :label="'休息时长5：'">
-          <el-input v-model="workingCalendar.exceptduration5" style="width: 130px"></el-input>
+          <el-input v-model="workingCalendar.exceptduration5" @change="workTimeSum"  style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label="'休息时间点6：'">
           <el-time-picker
@@ -142,10 +142,10 @@
           </el-time-picker>
         </el-form-item>
         <el-form-item :label="'休息时长6：'">
-          <el-input v-model="workingCalendar.exceptduration6" style="width: 130px"></el-input>
+          <el-input v-model="workingCalendar.exceptduration6" @change="workTimeSum"  style="width: 130px"></el-input>
         </el-form-item>
-        <el-form-item :label="'备注：'">
-          <el-input v-model="workingCalendar.remark" style="width: 275px"></el-input>
+        <el-form-item :label="'累计工作时间：'">
+          <el-input v-model="workingCalendar.worktime" disabled style="width: 275px"></el-input>
         </el-form-item>
       </el-form>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
@@ -518,15 +518,33 @@ export default {
 
       })
     },
+    workTimeSum() {
+      let durationTime = parseFloat(this.workingCalendar.exceptduration1 || 0) + parseFloat(this.workingCalendar.exceptduration2 || 0) + parseFloat(this.workingCalendar.exceptduration3 || 0)
+        + parseFloat(this.workingCalendar.exceptduration4 || 0) + parseFloat(this.workingCalendar.exceptduration5 || 0) + parseFloat(this.workingCalendar.exceptduration6 || 0)
+
+      this.workingCalendar.worktime = 24 - durationTime
+    },
     // 保存修改后的班次信息
     updateWorkingCalendar() {
 
-      this.workingCalendar.excepttime1 = this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime1 + ':00').format('H')
-      this.workingCalendar.excepttime2 = this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime2 + ':00').format('H')
-      this.workingCalendar.excepttime3 = this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime3 + ':00').format('H')
-      this.workingCalendar.excepttime4 = this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime4 + ':00').format('H')
-      this.workingCalendar.excepttime5 = this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime5 + ':00').format('H')
-      this.workingCalendar.excepttime6 = this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime6 + ':00').format('H')
+      this.workingCalendar.excepttime1 = parseInt(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime1 + ':00').format('H'))
+        + parseFloat(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime1 + ':00').format('mm')) / 60
+      this.workingCalendar.excepttime2 = parseInt(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime2 + ':00').format('H'))
+        + parseFloat(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime2 + ':00').format('mm')) / 60
+      this.workingCalendar.excepttime3 = parseInt(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime3 + ':00').format('H'))
+        + parseFloat(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime3 + ':00').format('mm')) / 60
+      this.workingCalendar.excepttime4 = parseInt(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime4 + ':00').format('H'))
+        + parseFloat(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime4 + ':00').format('mm')) / 60
+      this.workingCalendar.excepttime5 = parseInt(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime5 + ':00').format('H'))
+        + parseFloat(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime5 + ':00').format('mm')) / 60
+      this.workingCalendar.excepttime6 = parseInt(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime6 + ':00').format('H'))
+        + parseFloat(this.dayjs(this.workingCalendar.scheduledate + ' ' + this.workingCalendar.exceptexacttime6 + ':00').format('mm')) / 60
+
+      let durationTime = parseFloat(this.workingCalendar.exceptduration1 || 0) + parseFloat(this.workingCalendar.exceptduration2 || 0) + parseFloat(this.workingCalendar.exceptduration3 || 0)
+        + parseFloat(this.workingCalendar.exceptduration4 || 0) + parseFloat(this.workingCalendar.exceptduration5 || 0) + parseFloat(this.workingCalendar.exceptduration6 || 0)
+
+      this.workingCalendar.worktime = 24 - durationTime
+
       updateWorkingCalendar(this.workingCalendar).then(({data}) => {
         if (data && data.code == 0) {
           this.$message.success(data.msg)

src/views/modules/yieldReport/com_produce_report_normal.vue

@@ -475,6 +475,11 @@
                              style=" width: 120px; margin-bottom: 5px;margin-left: 3PX; ">
                     {{ buttons.notProduce }}
                   </el-button>
+<!--                  <el-button type="primary" @click="produceKeyMaterialModal"-->
+<!--                             :disabled="!buttonTags.createNewRollFlag"-->
+<!--                             style=" width: 120px; margin-bottom: 5px;margin-left: 3PX; ">-->
+<!--                    {{ buttons.scannerRoll }}-->
+<!--                  </el-button>-->
                 </div>
                 <el-button type="primary" class="controller-bun" :disabled="buttonTags.finishScheduleFlag"
                            style=" width: 80px; margin-bottom: 5px; " @click="popoverFlag=true"
@@ -584,6 +589,9 @@
                         :visible.sync="showMaterialFlag" @refreshPageData="refreshPageData">
 
     </comProduceMaterial>
+    <comProduceKeyMaterial ref="comProduceKeyMaterial" :close-on-click-modal="false"
+                        :visible.sync="showKeyMaterialFlag" @refreshPageData="refreshPageData">
+    </comProduceKeyMaterial>
 
     <!--  换料组件  -->
     <comReplaceMaterial ref="comReplaceMaterial" :close-on-click-modal="false"
@@ -682,6 +690,7 @@ import comDefectRoll from "./com_defect_roll";/*报告不良品卷*/
 import comProduceTool from "./com_produce_tool";/*生产过程的工具组件*/
 import comReplaceTool from "./com_replace_tool";/*生产过程的工具组件*/
 import comProduceMaterial from "./com_produce_material";/*生产过程的材料组件*/
+import comProduceKeyMaterial from "./com_produce_key_material";/*生产过程的材料组件*/
 import comReplaceMaterial from "./com_replace_material"/*换料组件*/
 import comCuttingMaterial from "./com_cutting_material"/*材料下料*/
 import comProduceDown from "./com_produce_down";/*停机组件*/
@@ -713,6 +722,7 @@ export default {
       showToolFlag: false,
       showReplaceToolFlag: false,
       showMaterialFlag: false,
+      showKeyMaterialFlag: false,
       showReplaceMaterialFlag: false,
       showCuttingMaterialFlag: false,
       showDownFlag: false,
@@ -2968,6 +2978,7 @@ export default {
         preReport: '产量报告',
         deleteRoll: '删除卷',
         notProduce: '未生产下机拆卷',
+        scannerRoll: '扫描卷',
       },
       buttonList: [
         {
@@ -3478,6 +3489,7 @@ export default {
     comProduceTool,/*生产过程的工具组件*/
     comReplaceTool,/*刀模切换组件*/
     comProduceMaterial,/*生产过程的材料组件*/
+    comProduceKeyMaterial,/*生产过程的材料组件*/
     comReplaceMaterial,/*换料的组件*/
     comCuttingMaterial,/*材料下料的功能*/
     comProduceDown,/*生产过程的停机组件*/
@@ -3915,7 +3927,7 @@ export default {
             // 如果该工序是首工序，也不允许使用
             if (data.data == this.scheduleData.itemNo) {
               this.buttonTags.malformedMaterialButtonFlag = true
-            }else {
+            } else {
               this.buttonTags.malformedMaterialButtonFlag = false
             }
           }
@@ -4111,6 +4123,16 @@ export default {
       });
     },
 
+    // 主材
+    produceKeyMaterialModal() {
+      //1.首先调用菜单判断方式  打开生产过程的材料的页面
+      //checkProduceButton('produceMaterialFlag');
+      //打开生产过程的工具的页面
+      this.$nextTick(() => {
+        this.showKeyMaterialFlag = true;
+        this.$refs.comProduceKeyMaterial.init(this.scheduleData, this.operatorData)
+      });
+    },
     /*生产过程的停机组件*/
     produceDownModal() {
       //1.首先调用菜单判断方式  打开生产过程的停机的页面