@logwire/logwire-wms-pda-ui 1.2.0 → 3.1.1

package/src/components/page/process/process/console/index.vue

@@ -5,521 +5,234 @@
 -->
 <template>
   <div>
-
     <lw-nav-bar :title="$lwLanguage.get('','加工控制台')"/>
-
     <div class="lw-global-page-box">
-
-      <dock-info/>
-
-      <div
-        style="margin-top: 10px"
-        class="lw-global-tab-box"
-      >
-        <van-tabs
-          type="card"
-          animated
-          v-model="tabActive"
-        >
-
-          <van-tab
-            name="ing"
-            :title="$lwLanguage.get('','正在加工')"
-          >
-
-            <dock-task-info
-              v-if="dockData.ing && Object.keys(dockData.ing).length"
-              :item="dockData.ing"
-              @click="taskClick(dockData.ing)"
-            />
-            <lw-not-data
-              v-else
-              :content="$lwLanguage.get('','当前未选择任务')"
-            />
-
+      <dock-info :code="tableId"/>
+      <div style="margin-top: 10px" class="lw-global-tab-box">
+        <van-tabs type="card" animated v-model="tabActive">
+          <van-tab name="ing" :title="$lwLanguage.get('','正在加工')">
+            <dock-task-info v-if="doingTask" :item="doingTask" @click="taskClick(doingTask)"/>
+            <lw-not-data v-else :content="$lwLanguage.get('','当前未选择任务')"/>
           </van-tab>
-
-          <van-tab
-            name="task"
-            :title="$lwLanguage.get('','任务列表')"
-          >
-
-            <template v-if="dockData.taskList && dockData.taskList.length">
-              <dock-task-info
-                v-for="(i,k) in dockData.taskList"
-                :key="k"
-                :item="i"
-                :index="k"
-                @click="taskClick(i)"
-              />
-
+          <van-tab name="task" :title="$lwLanguage.get('','任务列表')">
+            <template v-if="taskList.length">
+              <dock-task-info v-for="(i,k) in taskList" :key="i.id" :item="i" :index="k" @click="taskClick(i)"/>
             </template>
-
             <lw-not-data v-else/>
           </van-tab>
-
           <van-tab
             name="stop"
-            :title="$lwLanguage.get('','暂停中')"
-          >
-
-            <template v-if="dockData.stopList && dockData.stopList.length">
-              <dock-task-info
-                v-for="(i,k) in dockData.stopList"
-                :key="k"
-                :item="i"
-                :index="k"
-                look-data-type="not"
-                @click="taskClick(i)"
-              >
-
-                <template #bottom>
-
-                  <div class="lw-global-model-bottom-radius">
-
-                    <lw-title-value-cell
-                      :title="$lwLanguage.get('','暂停原因')"
-                      :value="i.stop || '-'"
-                      is-row-start
-                    />
-
-                    <div
-                      style="text-align: right"
-                      class="lw-global-row-end"
-                    >
-                      <lw-button
-                        mini
-                        @click="recover(i)"
-                      >{{ $lwLanguage.get('','恢复') }}</lw-button>
-                    </div>
-
-                  </div>
-
-
-                </template>
-
-              </dock-task-info>
-
+            :title="$lwLanguage.get('','暂停中')">
+            <template v-if="pauseList.length">
+              <dock-task-info v-for="(i,k) in pauseList" :key="i.id" :item="i" :index="k" look-data-type="not" @click="taskClick(i)"/>
             </template>
-
             <lw-not-data v-else/>
           </van-tab>
-
         </van-tabs>
       </div>
-
-      <lw-bottom-bar
-        v-if="
-          tabActive==='ing' &&
-          dockData.ing &&
-          Object.keys(dockData.ing).length
-        "
-      >
-
-        <lw-button @click="actionProcess">
-          {{ $lwLanguage.get('','执行加工') }}
+      <lw-bottom-bar v-if="tabActive==='ing' && doingTask">
+        <lw-button @click="start(doingTask)">
+          {{ $lwLanguage.get('', '执行加工') }}
         </lw-button>
-
       </lw-bottom-bar>
-
     </div>
-
-
     <!-- 任务详情弹框 -->
-    <lw-popup
-      :title="$lwLanguage.get('','任务详情')"
-      v-model="taskInfoPopup.show"
-      background="#f0f0f0"
-    >
-
-      <dock-task-info
-        :item="taskInfoPopup.data.task"
-        look-data-type="not"
-      >
-
-        <template #bottom>
-
-          <div class="lw-global-model-bottom-radius">
-            <lw-title-value-cell
-              :title="$lwLanguage.get('','暂停原因')"
-              :value="taskInfoPopup.data.task.stop || '-'"
-              :is-row="false"
-            />
-          </div>
-
-        </template>
-
-      </dock-task-info>
-
-      <div
-        style="margin-top: 10px"
-        class="lw-global-tab-box"
-      >
-        <van-tabs
-          type="card"
-          animated
-          v-model="taskInfoPopup.tabActive"
-        >
-
-          <van-tab
-            name="raw"
-            :title="$lwLanguage.get('','原料')"
-          >
-            <div
-              v-for="(i,k) in taskInfoPopup.data.raw"
-              :key="k"
-              class="lw-global-model-box lw-global-animation-out"
-              :style="{animationDelay: 50 * k + 'ms'}"
-            >
-              <lw-sku-info-module
-                :sku-code="i.code"
-                :sku-name="i.name"
-                is-row-first
-              >
-                <lw-tag
-                  style="flex-shrink: 0"
-                  round
-                  plain
-                >{{ i.typeLabel }}</lw-tag>
-
+    <lw-popup :title="$lwLanguage.get('','任务详情')" v-model="taskInfoPopup.show" background="#f0f0f0">
+      <dock-task-info :item="taskInfoPopup.task" look-data-type="not"/>
+      <div style="margin-top: 10px" class="lw-global-tab-box">
+        <van-tabs type="card" animated v-model="taskInfoPopup.tabActive">
+          <van-tab name="raw" :title="$lwLanguage.get('','原料')">
+            <div v-for="(i,k) in taskInfoPopup.task.materials" :key="k"
+              class="lw-global-model-box lw-global-animation-out" :style="{animationDelay: 50 * k + 'ms'}">
+              <lw-sku-info-module :sku-code="i.skuCode" :sku-name="i.skuName" is-row-first>
+                <lw-tag style="flex-shrink: 0" round plain>{{ $lwDict.getDictLabel('WmsMaterialType', i.materialType, 'UNKNOWN') }}</lw-tag>
               </lw-sku-info-module>
-
               <div class="lw-global-flex-between lw-global-row-end">
-
                 <lw-title-value-cell
                   :title="$lwLanguage.get('','数量')"
-                  :value="i.count"
-                  :is-row="false"
-                />
-
+                  :value="i.qty"
+                  :is-row="false"/>
                 <lw-title-value-cell
                   :title="$lwLanguage.get('','备料量')"
-                  :value="i.a"
+                  :value="i.prepareQty"
                   :is-row="false"
-                  val-bold
-                />
-
+                  val-bold/>
                 <lw-title-value-cell
                   :title="$lwLanguage.get('','消耗量')"
-                  :value="i.o"
+                  :value="i.expendQty"
                   :is-row="false"
                   val-bold
-                  val-red
-                />
-
+                  val-red/>
               </div>
-
             </div>
           </van-tab>
-
           <van-tab
             name="over"
-            :title="$lwLanguage.get('','成品')"
-          >
-            <div
-              v-for="(i,k) in taskInfoPopup.data.over"
-              :key="k"
+            :title="$lwLanguage.get('','成品')">
+            <div v-for="(i,k) in taskInfoPopup.task.products" :key="i.id"
               class="lw-global-model-box lw-global-animation-out"
-              :style="{animationDelay: 50 * k + 'ms'}"
-            >
+              :style="{animationDelay: 50 * k + 'ms'}">
               <lw-sku-info-module
-                :sku-code="i.code"
-                :sku-name="i.name"
+                :sku-code="i.skuCode"
+                :sku-name="i.skuName"
                 is-row-first
-                :show-right="false"
-              />
-
+                :show-right="false"/>
               <div class="lw-global-flex-between lw-global-row-end">
-
                 <lw-title-value-cell
                   :title="$lwLanguage.get('','计划量')"
-                  :value="i.count"
-                  :is-row="false"
-                />
-
+                  :value="i.qty"
+                  :is-row="false"/>
                 <lw-title-value-cell
                   :title="$lwLanguage.get('','已加工')"
-                  :value="i.a"
+                  :value="i.endedQty || 0"
                   :is-row="false"
-                  val-bold
-                />
-
+                  val-bold/>
                 <lw-title-value-cell
                   :title="$lwLanguage.get('','待加工')"
-                  :value="i.o"
+                  :value="i.qty - (i.endedQty || 0)"
                   :is-row="false"
                   val-bold
-                  val-red
-                />
-
+                  val-red/>
               </div>
-
             </div>
-
           </van-tab>
         </van-tabs>
       </div>
-
+      <template #button>
+        <lw-button v-if="taskInfoPopup.task.status === '400'" @click="start(taskInfoPopup.task)">{{ $lwLanguage.get('', '开始加工') }}</lw-button>
+        <template v-if="taskInfoPopup.task.status === '500'">
+          <lw-button @click="pause">{{ $lwLanguage.get('', '暂停加工') }}</lw-button>
+          <lw-button @click="start(taskInfoPopup.task)">{{ $lwLanguage.get('', '执行加工') }}</lw-button>
+        </template>
+        <lw-button v-if="taskInfoPopup.task.status === '550'" @click="resume">{{ $lwLanguage.get('', '恢复加工') }}</lw-button>
+      </template>
+    </lw-popup>
+    <!-- 暂停弹框 -->
+    <lw-popup
+      :title="$lwLanguage.get('','暂停加工')"
+      v-model="pausePopup.show"
+      @closed="pausePopupOff">
+      <lw-cell-popup-radio
+        v-model="pausePopup.cause"
+        :title="$lwLanguage.get('','原因')"
+        required
+        dict-key="WmsSkuPackTaskPauseReason"/>
+      <lw-input
+        :title="$lwLanguage.get('','备注')"
+        v-model="pausePopup.remark"
+        type="textarea"
+        :rows="4"
+        :show-bottom-border="false"/>
+      <template #button>
+        <lw-button @click="pausePopupConfirm">
+          {{ $lwLanguage.get('', '确认') }}
+        </lw-button>
+      </template>
     </lw-popup>
-
   </div>
 </template>
 
 <script>
-import dockInfo from "../components/dockInfo.vue";
-import dockTaskInfo from "../components/dockTaskInfo.vue";
+import * as api from '../../../../../api/process/order'
+
+import dockInfo from '../components/dockInfo.vue'
+import dockTaskInfo from '../components/dockTaskInfo.vue'
 
 export default {
-  name: "lwProcessActionConsolePage",
-  components:{
+  name: 'lwProcessActionConsolePage',
+  components: {
     dockInfo,
     dockTaskInfo,
   },
-  data() {
+  data () {
     return {
+      tableId: null,
+      tasks: [],
       // tab激活项
       tabActive: '',
-
-      // 线路数据
-      dockData:{
-        ing: {
-          taskNum: 'RW-001',
-          lot: ['中件', '快移', 'BO'],
-          orderCode: 'DD-001',
-          statusLabel: '加工中',
-          ownerCode: 'HZ-001',
-          ownerName: '货主-001',
-          bomCode: 'BOM-001',
-          bomName: '包装001',
-          rate: 10,
-          startTime: '2022-08-12T10:00:00.00Z',
-          endTime: '2022-08-12T12:00:00.00Z',
-          time: 120,
-          plan: 100,
-          over: 40,
-          ing: 60,
-          setout: 98
-        },
-        taskList: [
-          {
-            taskNum: 'RW-001',
-            lot: ['中件','快移','BO'],
-            orderCode:'DD-001',
-            statusLabel: '加工中',
-            ownerCode: 'HZ-001',
-            ownerName: '货主-001',
-            bomCode:'BOM-001',
-            bomName: '包装001',
-            rate: 10,
-            startTime: '2022-08-12T10:00:00.00Z',
-            endTime: '2022-08-12T12:00:00.00Z',
-            time: 120,
-            plan: 100,
-            over: 40,
-            ing: 60,
-            setout: 98
-          },
-          {
-            taskNum: 'RW-002',
-            lot: ['中件','快移','BO'],
-            orderCode:'DD-002',
-            statusLabel: '加工中',
-            ownerCode: 'HZ-002',
-            ownerName: '货主-002',
-            bomCode:'BOM-002',
-            bomName: '包装002',
-            rate: 10,
-            startTime: '2022-08-12T10:00:00.00Z',
-            endTime: '2022-08-12T12:00:00.00Z',
-            time: 120,
-            plan: 100,
-            over: 40,
-            ing: 60,
-            setout: 98
-          },
-          {
-            taskNum: 'RW-003',
-            lot: ['中件','快移','BO'],
-            orderCode:'DD-003',
-            statusLabel: '加工中',
-            ownerCode: 'HZ-003',
-            ownerName: '货主-003',
-            bomCode:'BOM-003',
-            bomName: '包装003',
-            rate: 10,
-            startTime: '2022-08-12T10:00:00.00Z',
-            endTime: '2022-08-12T12:00:00.00Z',
-            time: 120,
-            plan: 100,
-            over: 40,
-            ing: 60,
-            setout: 98
-          },
-        ],
-        stopList: [
-          {
-            taskNum: 'RW-001',
-            lot: ['中件','快移','BO'],
-            orderCode:'DD-001',
-            statusLabel: '加工中',
-            ownerCode: 'HZ-001',
-            ownerName: '货主-001',
-            bomCode:'BOM-001',
-            bomName: '包装001',
-            rate: 10,
-            startTime: '2022-08-12T10:00:00.00Z',
-            endTime: '2022-08-12T12:00:00.00Z',
-            time: 120,
-            plan: 100,
-            over: 40,
-            ing: 60,
-            setout: 98,
-            stop: '这里是暂停原因'
-          },
-          {
-            taskNum: 'RW-002',
-            lot: ['中件','快移','BO'],
-            orderCode:'DD-002',
-            statusLabel: '加工中',
-            ownerCode: 'HZ-002',
-            ownerName: '货主-002',
-            bomCode:'BOM-002',
-            bomName: '包装002',
-            rate: 10,
-            startTime: '2022-08-12T10:00:00.00Z',
-            endTime: '2022-08-12T12:00:00.00Z',
-            time: 120,
-            plan: 100,
-            over: 40,
-            ing: 60,
-            setout: 98,
-            stop: '这里是暂停原因'
-          },
-          {
-            taskNum: 'RW-003',
-            lot: ['中件','快移','BO'],
-            orderCode:'DD-003',
-            statusLabel: '加工中',
-            ownerCode: 'HZ-003',
-            ownerName: '货主-003',
-            bomCode:'BOM-003',
-            bomName: '包装003',
-            rate: 10,
-            startTime: '2022-08-12T10:00:00.00Z',
-            endTime: '2022-08-12T12:00:00.00Z',
-            time: 120,
-            plan: 100,
-            over: 40,
-            ing: 60,
-            setout: 98,
-            stop: '这里是暂停原因'
-          },
-        ],
-      },
-
       // 任务详情弹框
-      taskInfoPopup:{
+      taskInfoPopup: {
         show: false,
-        data:{
-          task: {
-              taskNum: 'RW-001',
-              lot: ['中件','快移','BO'],
-              orderCode:'DD-001',
-              statusLabel: '加工中',
-              ownerCode: 'HZ-001',
-              ownerName: '货主-001',
-              bomCode:'BOM-001',
-              bomName: '包装001',
-              rate: 10,
-              startTime: '2022-08-12T10:00:00.00Z',
-              endTime: '2022-08-12T12:00:00.00Z',
-              time: 120,
-              plan: 100,
-              over: 40,
-              ing: 60,
-              setout: 98
-            },
-          raw:[
-            {
-              code:'W-001',
-              name:'纸箱-001',
-              typeLabel:'主材料',
-              count: 100,
-              a: 100,
-              o: 20
-            },
-            {
-              code:'W-001',
-              name:'纸箱-001',
-              typeLabel:'附件',
-              count: 100,
-              a: 100,
-              o: 20
-            },
-            {
-              code:'W-001',
-              name:'纸箱-001',
-              typeLabel:'附件',
-              count: 100,
-              a: 100,
-              o: 20
-            },
-          ],
-          over: [
-            {
-              code:'W-001',
-              name:'纸箱-001',
-              typeLabel:'主材料',
-              count: 100,
-              a: 100,
-              o: 20
-            },
-            {
-              code:'W-001',
-              name:'纸箱-001',
-              typeLabel:'附件',
-              count: 100,
-              a: 100,
-              o: 20
-            },
-            {
-              code:'W-001',
-              name:'纸箱-001',
-              typeLabel:'附件',
-              count: 100,
-              a: 100,
-              o: 20
-            },
-          ],
-        },
+        task: {},
         tabActive: ''
+      },
+      // 暂停弹框
+      pausePopup: {
+        show: false,
+        cause: '',
+        remark: ''
       }
     }
   },
+  computed: {
+    doingTask () {
+      return this.tasks.find(i => i.status === '500')
+    },
+    taskList () {
+      return this.tasks.filter(i => ['400', '500', '550'].includes(i.status))
+    },
+    pauseList () {
+      return this.tasks.filter(i => i.status === '550')
+    }
+  },
+  created () {
+    const tableId = this.$route.query.workTableId
+    if (!tableId) {
+      return this.$lwShowErrorMsg('未指定加工台参数')
+    }
+    this.tableId = tableId
+    this.loadTableTasks(tableId)
+  },
   methods: {
-
+    loadTableTasks (tableId) {
+      api.getWorkTableTaskList(tableId).then(res => this.tasks = res)
+    },
     // 任务行被点击
-    taskClick(item){
-      console.log(item,'click')
+    taskClick (item) {
+      this.taskInfoPopup.task = item
       this.taskInfoPopup.show = true
     },
-
+    // 开始
+    start (order) {
+      api.doWorkOrderStart(order.id).then(() => {
+        this.$router.push({
+          path: '/process/action/lwAction',
+          query: { orderId: order.id }
+        })
+      })
+    },
     // 恢复
-    recover(item){
-      console.log(item,'recover')
+    resume () {
+      api.doWorkOrderResume(this.taskInfoPopup.task.id).then(() => {
+        this.$router.push({
+          path: '/process/action/lwAction',
+          query: { orderId: this.taskInfoPopup.task.id }
+        })
+      })
     },
-
-    // 执行加工
-    actionProcess(){
-      this.$router.push({
-        path: '/process/action/lwAction'
+    // 暂停
+    pause () {
+      this.pausePopup.show = true
+      this.pausePopup.cause = ''
+      this.pausePopup.remark = ''
+    },
+    pausePopupOff () {
+      this.pausePopup.show = false
+      this.pausePopup.cause = ''
+      this.pausePopup.remark = ''
+    },
+    pausePopupConfirm () {
+      if (!this.pausePopup.cause) {
+        return this.$lwShowErrorMsg('暂停原因不能为空')
+      }
+      api.doWorkOrderPause(this.taskInfoPopup.task.id, this.pausePopup.cause, this.pausePopup.remark).then(() => {
+        this.loadTableTasks(this.tableId)
+        this.pausePopupOff()
+        this.taskInfoPopup.show = false
       })
-    }
-
+    },
   }
 }
 </script>
-
 <style scoped lang="less">
-
 </style>

package/src/components/page/process/process/content/index.js

@@ -1,11 +1,11 @@
-/*
-* 加工执行 - 加工台
-* @author: 张文
-* @date 2022-08-11
-* */
-
-import lwProcessActionContentPage from "./index.vue";
-
-lwProcessActionContentPage.install = Vue => Vue.component(lwProcessActionContentPage.name, lwProcessActionContentPage)
-
-export default lwProcessActionContentPage
+/*
+* 加工执行 - 加工台
+* @author: 张文
+* @date 2022-08-11
+* */
+
+import lwProcessActionContentPage from "./index.vue";
+
+lwProcessActionContentPage.install = Vue => Vue.component(lwProcessActionContentPage.name, lwProcessActionContentPage)
+
+export default lwProcessActionContentPage