Merge pull request '更新' (#20) from zwq into master

Reviewed-on: #20

src/views/common/ex-warehouse.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-15 15:17:30
  * @LastEditors: zwq
- * @LastEditTime: 2022-07-08 23:18:46
+ * @LastEditTime: 2022-07-13 09:51:46
  * @Description:
 -->
 <template>
@@ -34,7 +34,7 @@
     </el-card>
     <el-card class="base-container" style="margin-top: 20px; min-height: 200px">
       <el-row :gutter="30" style="padding: 20px;">
-        <el-col class="footer-item-container" :span="6" v-for="count in 2" :key="count">
+        <el-col class="footer-item-container" :span="6" v-for="count in 4" :key="count">
           <el-card class="footer-item-box base-container" @click.native="selectPlat(count)">
             <div class="plat" style="font-size: 24px">出库液压台{{ count }}</div>
           </el-card>

src/views/common/order-auto-submit.vue

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2022-03-04 10:22:13
  * @LastEditors: zwq
- * @LastEditTime: 2022-07-12 10:42:13
+ * @LastEditTime: 2022-07-13 10:11:05
  * @Description: file content
  * @FilePath: \mt-qj-wms-ui\src\views\common\order-auto-submit.vue
 -->
@@ -245,7 +245,7 @@
               requestData.taskCreateParamList.push({
                 autoTaskStep: 1,
                 autoTaskType: this.dataForm.autoTaskType,
-                craftCode: this.dataForm.secProcess,
+                craftCode: this.dataForm.firstProcess,
                 detParams: this.dataList,
                 kilnId: this.dataForm.firstPosition.split(',')[0],
                 processType: this.dataForm.processType,

src/views/common/order-auto.vue

@@ -86,7 +86,7 @@
         </el-table-column>
       </el-table>
     </div>
-    <div class="auto-undo">
+    <div class="auto-undo" v-if="false">
       <el-row style="margin: 10px 0; font-weight: bold">
         未完成自动任务
       </el-row>

src/views/order/current-task.vue

@@ -71,9 +71,23 @@
           }}</span>
         </template>
       </el-table-column>
+      <el-table-column prop="craftName" label="工艺"> </el-table-column>
       <el-table-column prop="startPosition" label="开始位置"> </el-table-column>
       <el-table-column prop="targetPosition" label="目标位置">
       </el-table-column>
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="80"
+        label="置顶"
+      >
+        <template slot-scope="scope">
+          <el-button type="text" size="small" @click="topList(scope.row.id)"
+            >置顶</el-button
+          >
+        </template>
+      </el-table-column>
       <el-table-column
         fixed="right"
         header-align="center"
@@ -115,7 +129,7 @@
             :disabled="scope.row.status === 1"
             style="color:red"
             size="small"
-            @click="deleteHandle(scope.row.sheetNo)"
+            @click="deleteHandle(scope.row.id)"
           >
             <el-tooltip
               class="item"
@@ -163,12 +177,27 @@ export default {
       pageSize: 10,
       totalPage: 0,
       dataListLoading: false,
-      statusList
+      statusList,
+      processList: []
     }
   },
   activated () {
     this.getDataList()
     this.timer = setInterval(this.getDataList, 180000)
+    this.$http({
+      url: this.$http.adornUrl('/craftInfo/page'),
+      method: 'post',
+      data: this.$http.adornData({
+        current: 1,
+        size: 999
+      })
+    }).then(({ data }) => {
+      if (data && data.code === 0) {
+        this.processList = data.data.records
+      } else {
+        this.processList.splice(0, this.processList.length)
+      }
+    })
   },
   methods: {
     // 获取数据列表
@@ -184,7 +213,15 @@ export default {
         })
       }).then(({ data }) => {
         if (data && data.code === 0) {
-          this.dataList = data.data.records
+          const resData = data.data.records
+          resData.forEach(item => {
+            if (item.craftCodeId) {
+              this.processList.find(item1 => {
+                if (item1.id === item.craftCodeId) { item.craftName = item1.craftCode }
+              })
+            }
+          })
+          this.dataList = resData
           this.totalPage = data.data.total
         } else {
           this.dataList = []
@@ -232,18 +269,38 @@ export default {
         }
       })
     },
+    topList (id) {
+      this.$http({
+        url: this.$http.adornUrl('/currTask/top'),
+        method: 'post',
+        data: this.$http.adornData({ id })
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.$message({
+            message: '操作成功',
+            type: 'success',
+            duration: 1500,
+            onClose: () => {
+              this.getDataList()
+            }
+          })
+        } else {
+          this.$message.error(data.msg)
+        }
+      })
+    },
     // 删除
-    deleteHandle (sheetNo) {
+    deleteHandle (id) {
-      this.$confirm(`确定对[生产单编号=${sheetNo}]进行删除操作?`, '提示', {
+      this.$confirm(`确定对[${id}]进行删除操作?`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       })
         .then(() => {
           this.$http({
-            url: this.$http.adornUrl('/currTask/deleteBySheetNo'),
+            url: this.$http.adornUrl('/currTask/deleteById'),
             method: 'post',
-            data: this.$http.adornData({sheetNo})
+            data: this.$http.adornData({ id })
           }).then(({ data }) => {
             if (data && data.code === 0) {
               this.$message({