问题清单

src/api/mes/pro/scheduleList.js

@@ -145,3 +145,21 @@ export function printData(query) {
     data: query
   });
 }
+
+// 完工作业
+export function change(query) {
+  return request({
+    url: "/mobile/pro/protask/change",
+    method: "post",
+    data: query
+  });
+}
+
+// 完工作业
+export function rollBACKschedule(query) {
+  return request({
+    url: "/mes/pro/protask/rollBACKschedule",
+    method: "post",
+    data: query
+  });
+}
\ No newline at end of file

src/i18n/lang/th_TH.json

@@ -2995,5 +2995,12 @@
 	"所属产线": "สายการผลิต",
 	"打印次数必须是整数": "จำนวนการพิมพ์ต้องเป็นจำนวนเต็ม",
 	"工序流向名称": "ชื่อการไหลของกระบวนการ",
-	"工序流向编码": "การเข้ารหัสการไหลของกระบวนการ"
+	"工序流向编码": "การเข้ารหัสการไหลของกระบวนการ",
+	"修改人": "แก้ไขโดย",
+	"修改时间": "แก้ไขเวลา",
+	"权限复制": "คัดลอกสิทธิ์",
+	"完工作业": "ดำเนินการแล้วเสร็จ",
+	"完工作业成功": "ความสำเร็จของงาน",
+	"取消排产": "ยกเลิกการปล่อยก๊าซ",
+	"工单是否确认取消排产": "ไม่ว่าจะเป็นใบสั่งงานยืนยันการยกเลิกการปล่อย"
 }

src/i18n/lang/zh_CN.json

@@ -2998,5 +2998,9 @@
 	"工序流向编码": "工序流向编码",
 	"修改人": "修改人",
 	"修改时间": "修改时间",
-	"权限复制": "权限复制"
+	"权限复制": "权限复制",
+	"完工作业": "完工作业",
+	"完工作业成功": "完工作业成功",
+	"取消排产": "取消排产",
+	"工单是否确认取消排产": "工单是否确认取消排产"
 }

src/views/login.vue

@@ -13,9 +13,9 @@
           <el-form-item prop="username">
             <el-input
               v-model="loginForm.username"
+              @keyup.enter.native="focusOnPassword"
               type="text"
               auto-complete="off"
-             
             >
               <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon"/>
             </el-input>
@@ -25,7 +25,7 @@
               v-model="loginForm.password"
               type="password"
               auto-complete="off"
-             
+              ref="pswRef"
               @keyup.enter.native="handleLogin"
             >
               <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon"/>
@@ -64,12 +64,6 @@
         </el-form>
       </div>
     </div>
-
-
-    <!--  底部  -->
-    <div class="el-login-footer">
-<!--      <span @click="toIPC">深ICP备2022002135号-1</span>-->
-    </div>
   </div>
 </template>
 
@@ -141,8 +135,10 @@ export default {
     }
   },
   methods: {
-    toIPC() {
-      window.open("https://beian.miit.gov.cn/", "_blank");
+    focusOnPassword(){
+      if (this.$refs['pswRef']) {
+        this.$refs['pswRef'].focus()
+      }
     },
     getCode() {
       getCodeImg().then(res => {

src/views/mes/pro/scheduleList/index.vue

@@ -144,6 +144,24 @@
           @click="handleJobAssignment"
         >{{$t('作业分派')}}</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          :disabled='single'
+          @click="handleFinish"
+        >{{$t('完工作业')}}</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          :disabled='single'
+          @click="handleCancel"
+        >{{$t('取消排产')}}</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -517,8 +535,10 @@ import {
   makeSchedule,
   getworkshopList,
   getworkstationList,
+  change,
   gettaskWorkunitList,
   getdefaultWorkCenterList,
+  rollBACKschedule,
   printData} from '@/api/mes/pro/scheduleList'
 import {putProtaskSplit} from '@/api/mes/pro/protask'
 import taskList from './taskList.vue'
@@ -606,6 +626,19 @@ export default {
     this.hanldeGetdefaultWorkCenterList()
   },
   methods: {
+    handleCancel() {
+      const workorderCode = this.selections[0].workorderCode
+      this.$modal
+        .confirm(workorderCode + this.$t('工单是否确认取消排产'))
+        .then( ()=> {
+          rollBACKschedule({taskBatchList: [this.selections[0].taskBatch]}).then(res=>{
+            if(res.code === 200) {
+              this.$modal.msgSuccess(this.$t('取消成功'));
+              this.getList()
+            }
+          })
+        })
+    },
     toOutsource() {
       this.$refs['taskListRef'].toOutsource().then(res => {
         this.isVisibleTASK = false
@@ -636,14 +669,7 @@ export default {
       getdefaultWorkCenterList().then(async (res) => {
         res = res.filter(v => v.workstationId !== 1)
         this.hanldeGetworkshopList()
-        if (res&&res.length) {
-          this.queryWorkunitParams.workshopId = res[0].workshopId
-        }
         await this.hanldeGetworkstationList()
-        if (this.queryWorkunitParams.workshopId) {
-          this.queryWorkunitParams.workstationId = res[0].workstationId? res[0].workstationId: this.workstationList[0].workstationId
-          this.hanldeGettaskWorkunitList()
-        }
         this.getList()
       });
     },
@@ -665,6 +691,20 @@ export default {
       const response = await getworkstationList({workshopId: null})
       this.workstationList = response.rows.filter(v => v.workstationId !== 1)
     },
+    handleFinish(){
+      const params = {
+        taskId: this.selections[0].taskId,
+        status: 'FINISHED',
+        taskWorkunitId: this.selections[0].taskWorkunitId,
+        workunitId: this.selections[0].workunitId
+      };
+      change(params).then(res => {
+        if(res.code === 200) {
+          this.$modal.msgSuccess(this.$t('完工作业成功'));
+          this.getList()
+        }
+      })
+    },
     handleJobAssignment() {
       this.Assignform = {
         quantity: 1,

src/views/mes/pro/workorder/indexApply.vue

@@ -717,7 +717,6 @@ export default {
     this.getList();
   },
   created() {
-    this.setDate();
     this.getList();
   },
   mounted(){
@@ -762,11 +761,6 @@ export default {
         this.getList()
       });
     },
-    //筛选日期设置默认值
-    setDate() {
-
-      this.daterangePurchaseDate = [dayjs().format('YYYY-MM-DD'), dayjs().add(7, 'day').format('YYYY-MM-DD')]
-    },
     handlePrint(){
       if(!this.ids || this.ids.length === 0) return this.$message.warning(this.$t('请选择工单'))
       this.printloading = true;