Merge branch 'dev'

src/common/api/order.js

@@ -15,11 +15,11 @@ export function workConfirmed(id) {
   )
 }
 
-export function workAssigned(id, user) {
-  return axios.post('platform/platformWorkOrder/assign', {
-    id: id,
-    leaders: user,
-  })
+export function workAssigned(data) {
+  return axios.post(
+    'platform/platformWorkOrder/assign',
+    data,
+  )
 }
 
 export function startWorder(id, estimateCompleteTime) {
@@ -35,12 +35,31 @@ export function archiveWorkOrder(id) {
   })
 }
 
+// export function completeWorkOrder(id) {
+//   return axios.post('platform/platformWorkOrder/complete', {
+//     id: id,
+//   })
+// }
 export function completeWorkOrder(id) {
-  return axios.post('platform/platformWorkOrder/complete', {
-    id: id,
-  })
+  return axios.post(
+    'platform/platformWorkOrder/intoAcceptance',
+    {
+      id: id,
+    },
+  )
+}
+export function acceptanWorkOrder(data) {
+  return axios.post(
+    'platform/platformWorkOrder/acceptance',
+    data,
+  )
+}
+export function PendingWorkOrder(data) {
+  return axios.post(
+    'platform/platformWorkOrder/closeForPending',
+    data,
+  )
 }
-
 export function replyTocustomer(id, msg) {
   return axios.post('platform/platformWorkOrderChat/add', {
     msg: msg,
@@ -76,6 +95,11 @@ export function closeForPending(id) {
     },
   )
 }
+export function close(id) {
+  return axios.post('platform/platformWorkOrder/close', {
+    id: id,
+  })
+}
 export function getInfo(id) {
   return axios.get(
     'platform/platformWorkOrder/get?id=' + id,

src/common/components/base/tableView.vue

@@ -3,7 +3,9 @@ import { mapState } from 'vuex'
 const globalIndex = Math.random()
 
 function getKey() {
-  return Math.random().toString().substr(3, 10)
+  return Math.random()
+    .toString()
+    .substr(3, 10)
 }
 export default {
   name: 'my-table',
@@ -86,6 +88,10 @@ export default {
       type: Function,
       default: () => {},
     },
+    cellStyle: {
+      type: Function,
+      default: () => {},
+    },
     highIds: {
       // 高亮显示行
       type: Array,
@@ -168,8 +174,12 @@ export default {
         // visibleMethod: this.visibleMethod
       }
       if (this.$props.customRightMenu?.name) {
-        const { code, name, prefixIcon, disabled } =
-          this.$props.customRightMenu
+        const {
+          code,
+          name,
+          prefixIcon,
+          disabled,
+        } = this.$props.customRightMenu
         obj.body.options[0].push({
           code,
           name,
@@ -310,8 +320,7 @@ export default {
           this.$emit('selectionChange', arr)
         } else if (this.keyCode === 'Control') {
           this.$refs.vxetable.setCheckboxRow([row], true)
-          const arr1 =
-            this.$refs.vxetable.getCheckboxRecords()
+          const arr1 = this.$refs.vxetable.getCheckboxRecords()
           this.$emit('selectionChange', arr1)
         } else {
           this.startIndex = $rowIndex
@@ -560,6 +569,7 @@ export default {
         loading={this.loading}
         cell-class-name={this.cellClassName}
         row-class-name={this.rowClassName}
+        cell-style={this.cellStyle}
         onCurrent-change={this.currentChange}
         onCheckbox-change={this.checkboxChange}
         onCheckbox-all={this.checkboxAll}

src/common/components/element-ui.js

@@ -18,6 +18,7 @@ import {
   Option,
   Cascader,
   Radio,
+  RadioGroup,
   Menu,
   Submenu,
   MenuItem,
@@ -48,6 +49,7 @@ const components = [
   Option,
   Cascader,
   Radio,
+  RadioGroup,
   Menu,
   MenuItem,
   Submenu,