2022-07-08 10:15:04 +08:00
8 changed files with 54 additions and 19 deletions
--- a/src/views/common/board.vue
+++ b/src/views/common/board.vue
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2022-03-07 15:31:13
 * @LastEditors: zwq
- * @LastEditTime: 2022-07-07 10:50:49
+ * @LastEditTime: 2022-07-08 08:36:01
 * @Description:
 -->
 <template>
@@ -11,7 +11,7 @@
      浙江求精科技车间生产看板
    </div>
    <div class="container-body">
-      <board v-for="(item,index) in wbData" :key="index" :wbData="item" :imgUrl="item.kilnCode + item.kilnId"></board>
+      <board v-for="(item,index) in wbData" :key="index" :wbData="item" :imgUrl="item.kilnCode"></board>
    </div>
  </div>
 </template>
--- a/src/views/common/order-auto-add.vue
+++ b/src/views/common/order-auto-add.vue
@@ -70,6 +70,7 @@
    methods: {
      init (row, idx) {
        this.visible = true
+        this.formLoading = false
        this.$nextTick(() => {
          this.$refs['dataForm'].resetFields()
          if (row) {
@@ -110,7 +111,7 @@
      dataFormSubmit () {
        this.$refs['dataForm'].validate((valid) => {
          if (valid) {
-            if (this.editIndex) {
+            if (this.editIndex || this.editIndex === 0) {
              const taskList = JSON.parse(sessionStorage.getItem('autoTaskList'))
              taskList.splice(this.editIndex, 1, this.dataForm)
              sessionStorage.setItem('autoTaskList', JSON.stringify(taskList))
--- a/src/views/common/order-auto-submit.vue
+++ b/src/views/common/order-auto-submit.vue
@@ -1,8 +1,8 @@
 <!--
 * @Author: gtz
 * @Date: 2022-03-04 10:22:13
- * @LastEditors: gtz
- * @LastEditTime: 2022-03-05 12:09:38
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-07-08 09:41:08
 * @Description: file content
 * @FilePath: \mt-qj-wms-ui\src\views\common\order-auto-submit.vue
 -->
@@ -144,6 +144,7 @@
    },
    methods: {
      init (list) {
+        this.dataList.splice(0, this.dataList.length)
        this.dataList = list
        this.visible = true
        this.$nextTick(() => {
@@ -252,10 +253,16 @@
            }).then(({data}) => {
              console.log(data)
              if (data && data.code === 0) {
-                this.$message.success('任务提交成功')
-                this.dataList = []
+                this.$message({
+                  message: '操作成功',
+                  type: 'success',
+                  duration: 1500,
+                  onClose: () => {
+                    this.visible = false
                    sessionStorage.setItem('autoTaskList', '')
                    this.$emit('refreshDataList')
+                  }
+                })
              } else {
                this.$message.warning(data.msg)
              }
--- a/src/views/common/order-process-add.vue
+++ b/src/views/common/order-process-add.vue
@@ -72,6 +72,7 @@
        this.visible = true
        this.row = null
        this.editIndex = null
+        this.formLoading = false
        this.$nextTick(() => {
          this.$refs['dataForm'].resetFields()
          if (row) {
--- a/src/views/common/order-process.vue
+++ b/src/views/common/order-process.vue
@@ -28,6 +28,11 @@
        </el-select>
        <!-- <el-button style="margin-left:10px" type="primary" @click="getPoint(1)">{{kilnId}}</el-button> -->
      </el-form-item>
+        <el-form-item>
+          <el-select v-model="craftCode" placeholder="工艺">
+            <el-option v-for="item in processList" :key="item.id" :value="item.code" :label="item.craftCode" />
+          </el-select>
+        </el-form-item>
      <el-form-item style="margin-left:1%">
        <el-button type="primary" size="small" @click="submitTask()">提交任务</el-button>
      </el-form-item>
@@ -117,13 +122,15 @@
      return {
        startPosition: '',
        kilnId: '',
+        craftCode: '',
        targetPosition: '',
        dataList: [],
        processType: null,
        dataListLoading: false,
        addOrUpdateVisible: false,
        processPointVisible: false,
-        eqList: []
+        eqList: [],
+        processList: []
      }
    },
    components: {
@@ -151,6 +158,21 @@
          }
          this.getDataList()
        })
+
+        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 = []
+          }
+        })
      },
      // 获取数据列表
      getDataList () {
@@ -199,6 +221,11 @@
            message: '请选择窑炉',
            type: 'warning'
          })
+        } else if (!this.craftCode) {
+          this.$message({
+            message: '请选择工艺',
+            type: 'warning'
+          })
        } else if (this.processType !== 0 && this.processType !== 1) {
          this.$message.warning('请选择加工类型')
        } else {
@@ -211,7 +238,7 @@
              url: this.$http.adornUrl(`/currTask/createProcessTask`),
              method: 'post',
              data: this.$http.adornData({
-                craftCode: '',
+                craftCode: this.craftCode,
                detParams: this.dataList,
                kilnId: this.kilnId,
                processType: this.processType,
@@ -220,7 +247,6 @@
                // this.targetPosition
              })
            }).then(({data}) => {
-              console.log(data)
              if (data && data.code === 0) {
                this.$message.success('任务提交成功')
                this.dataList = []
--- a/src/views/order/current-task.vue
+++ b/src/views/order/current-task.vue
@@ -53,19 +53,18 @@
        <template slot-scope="scope">
          <span>{{
            scope.row.taskType === 0
-              ? "缓存到窑炉加工"
+              ? "入库到窑炉"
              : scope.row.taskType === 1
-              ? "出炉到缓存"
+              ? "入库到缓存"
              : scope.row.taskType === 2
-              ? "缓存出库"
-              : "入库缓存"
+              ? "窑炉出库到缓存区"
+              : "缓存区出库"
          }}</span>
        </template>
      </el-table-column>
      <el-table-column prop="startPosition" label="开始位置"> </el-table-column>
      <el-table-column prop="targetPosition" label="目标位置">
      </el-table-column>
-      <el-table-column prop="vehicleName" label="车辆名称"> </el-table-column>
      <el-table-column
        fixed="right"
        header-align="center"
@@ -236,7 +235,7 @@ export default {
          this.$http({
            url: this.$http.adornUrl('/currTask/deleteBySheetNo'),
            method: 'post',
-            data: this.$http.adornData(sheetNo)
+            data: this.$http.adornData({sheetNo})
          }).then(({ data }) => {
            if (data && data.code === 0) {
              this.$message({
--- a/static/config/index.js
+++ b/static/config/index.js
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-15 08:20:28
 * @LastEditors: zwq
- * @LastEditTime: 2022-07-06 15:12:03
+ * @LastEditTime: 2022-07-08 09:06:37
 * @Description:
 */
 /**
@@ -13,6 +13,7 @@

  // api接口请求地址
  window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.18:8080/api/'
+  window.SITE_CONFIG['wbUrl'] = '192.168.1.18:8080'

  // cdn地址 = 域名 + 版本号
  window.SITE_CONFIG['domain'] = './' // 域名
--- a/static/img/lu/BMD1.png
+++ b/static/img/lu/BMD1.png