8/14

src/common/api/order.js

@@ -65,6 +65,20 @@ export function PendingWorkOrder(data) {
     data,
   )
 }
+
+export function ShelveWorkOrder(data) {
+  return axios.post(
+    'platform/platformWorkOrder/shelveForPending',
+    data,
+  )
+}
+export function TurnBackToPending(data) {
+  return axios.post(
+    'platform/platformWorkOrder/turnBackToPending',
+    data,
+  )
+}
+
 export function replyTocustomer(id, msg) {
   return axios.post('platform/platformWorkOrderChat/add', {
     msg: msg,

src/components/base/icon.vue

+<template>
+  <i
+    v-if="unicodeIcon"
+    class="erpIconfont erp unicode-icon"
+    v-html="unicodeIcon"
+  ></i>
+  <svg v-else class="svg-icon erp" aria-hidden="true">
+    <slot name="title"></slot>
+    <use :xlink:href="svgIcon"></use>
+  </svg>
+</template>
+<script>
+export default {
+  name: 'Icon',
+  props: {
+    name: {
+      type: String,
+      required: true,
+    },
+  },
+  computed: {
+    unicodeIcon() {
+      if (this.name.match(/^x[a-f0-9]{4}$/)) {
+        return `&#${this.name};`
+      }
+      return undefined
+    },
+    svgIcon() {
+      if (this.unicodeIcon) return undefined
+      return `#erp-${this.name}`
+    },
+  },
+}
+</script>
+<style>
+.unicode-icon {
+  width: 1em;
+  height: 1em;
+  color: inherit;
+}
+.svg-icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
+</style>
\ No newline at end of file

src/views/home/navMenu.vue

@@ -297,7 +297,7 @@ export default {
               children: []
             },
           ]
-        }
+        },
       ],
       dialogVisible: false,
       oldPwd: '',

src/views/system/sku-sort.vue

@@ -38,6 +38,9 @@
       <el-form-item>
         <el-button type="danger" @click="deleteSection()">删除</el-button>
       </el-form-item>
+      <el-form-item style="margin-bottom: 0px">
+        <el-button type="primary" @click="importExcel">导入</el-button>
+      </el-form-item>
     </el-form>
     <div class="table_wrap">
       <my-table
@@ -368,6 +371,22 @@ export default {
   },
 
   methods: {
+    importExcel() {
+      const input = document.createElement('input')
+      input.style.display = 'none'
+      input.type = 'file'
+      input.click()
+      input.onchange = async () => {
+        const form = new FormData()
+        form.append('importExcel', input.files.length > 0 ? input.files[0] : [])
+        const res = await axios.post('baseProperty/importBaseProperty', form)
+        console.log(res)
+        if (res.code === 200) {
+          this.$message.success('导入成功')
+          this.getList()
+        }
+      }
+    },
     async changeDisableStatus(v, item) {
       try {
         await this.$confirm(

src/views/taskManage/index.vue

@@ -465,6 +465,20 @@
             @click="closeForPendingDialog"
             >不受理
           </el-button>
+          <el-button
+            size="mini"
+            type="danger"
+            v-if="statusCode === 'PRE_HANDLING'"
+            @click="shelveForPendingDialog"
+            >转至待定
+          </el-button>
+          <el-button
+            size="mini"
+            type="danger"
+            v-if="statusCode === 'PENDING'"
+            @click="turnBackToPending"
+            >转至待受理
+          </el-button>
         </div>
       </div>
     </el-dialog>
@@ -743,7 +757,7 @@
     </el-dialog>
     <!-- 不受理 -->
     <el-dialog
-      title="不受理"
+      :title="pendingTitle"
       :close-on-click-modal="false"
       :visible.sync="pendingVisible"
       width="800px"
@@ -810,6 +824,8 @@ import {
   replyTocustomer,
   acceptanWorkOrder,
   PendingWorkOrder,
+  ShelveWorkOrder,
+  TurnBackToPending,
   getOrderType,
   resume,
   pause,
@@ -1004,6 +1020,8 @@ export default {
       imgPreviewUrl: '',
       subscript: 0,
       imgList: [],
+      pendingTitle: '',
+      pendingBtn: 0
     }
   },
   mounted() {
@@ -1612,26 +1630,76 @@ export default {
       this.currentItem = item
     },
     closeForPendingDialog() {
+      this.pendingTitle = '不受理'
+      this.pendingBtn = 7
       this.pendingVisible = true
       if (this.$refs.pendingForm) {
         this.$refs.pendingForm.resetFields()
       }
     },
+    shelveForPendingDialog() {
+      this.pendingTitle = '转至待定'
+      this.pendingBtn = 9
+      this.pendingVisible = true
+      if (this.$refs.pendingForm) {
+        this.$refs.pendingForm.resetFields()
+      }
+    },
+    turnBackToPending() {
+      this.pendingBtn = 1
+      TurnBackToPending({
+        id: this.detail.id,
+        ...this.pendingForm,
+      }).then(res => {
+        if (res.code === 200) {
+          this.pendingVisible = false
+          this.detailVisible = false
+          this.getOrderTree()
+          this.getlist()
+        }
+      })
+    },
     submitPending() {
       this.$refs.pendingForm.validate(v => {
         if (v) {
           try {
-            PendingWorkOrder({
-              id: this.detail.id,
-              ...this.pendingForm,
-            }).then(res => {
-              if (res.code === 200) {
-                this.pendingVisible = false
-                this.detailVisible = false
-                this.getOrderTree()
-                this.getlist()
-              }
-            })
+            if (this.pendingBtn === 9) {
+              ShelveWorkOrder({
+                id: this.detail.id,
+                ...this.pendingForm,
+              }).then(res => {
+                if (res.code === 200) {
+                  this.pendingVisible = false
+                  this.detailVisible = false
+                  this.getOrderTree()
+                  this.getlist()
+                }
+              })
+            } else if (this.pendingBtn === 1) {
+              TurnBackToPending({
+                id: this.detail.id,
+                ...this.pendingForm,
+              }).then(res => {
+                if (res.code === 200) {
+                  this.pendingVisible = false
+                  this.detailVisible = false
+                  this.getOrderTree()
+                  this.getlist()
+                }
+              })
+            } else {
+              PendingWorkOrder({
+                id: this.detail.id,
+                ...this.pendingForm,
+              }).then(res => {
+                if (res.code === 200) {
+                  this.pendingVisible = false
+                  this.detailVisible = false
+                  this.getOrderTree()
+                  this.getlist()
+                }
+              })
+            }
           } catch (error) {}
         }
       })

vue.config.js

@@ -9,9 +9,7 @@ module.exports = defineConfig({
         target: 'http://10.168.31.142:8070',
         changeOrigin: true
         // 路径重写规则，这里将 /api 开头的请求路径替换为空字符串，即去掉 /api 前缀
-
       }
     }
   }
-
 })