linwenxin пре 8 месеци
родитељ
комит
3507d851ae

+ 14 - 14
src/views/partsManagement/accessoryWebsite/website-parts-shop-sales-manage/website-parts-shop-sales/components/website-parts-shop-sales-information.vue

@@ -399,17 +399,17 @@
         <!-- 新增或者编辑 -->
         <template v-if="~[0, 1].indexOf(this.type)">
           <el-button
-            v-if="~[0].indexOf(this.type) || ~['SAVE'].indexOf(form.state)"
+            v-if="~[0].indexOf(this.type) || ~['SAVE'].indexOf(form.status)"
             size="small"
             type="primary"
             @click="determine"
             >保存</el-button
           >
-          <el-button v-if="~['SAVE', 'SUBMIT'].indexOf(form.state)" size="small" type="primary" @click="createOrder"
+          <el-button v-if="~['SAVE', 'SUBMIT'].indexOf(form.status)" size="small" type="primary" @click="createOrder"
             >生成订单</el-button
           >
           <el-button
-            v-if="~[0].indexOf(this.type) || ~['SAVE'].indexOf(form.state)"
+            v-if="~[0].indexOf(this.type) || ~['SAVE'].indexOf(form.status)"
             size="small"
             type="primary"
             @click="add"
@@ -418,17 +418,17 @@
           <el-button v-if="~[0].indexOf(this.type)" size="small" @click="reset">重置</el-button>
         </template>
         <template>
-          <el-button v-if="~['SUBMIT'].indexOf(form.state)" size="small" type="primary" @click="previousStep"
+          <el-button v-if="~['SUBMIT'].indexOf(form.status)" size="small" type="primary" @click="previousStep"
             >上一步</el-button
           >
         </template>
         <!-- 提货 -->
         <template v-if="~[3].indexOf(this.type)">
-          <el-button v-if="~['PAYED'].indexOf(form.state)" size="small" type="primary" @click="confirmationDelivery"
+          <el-button v-if="~['PAYED'].indexOf(form.status)" size="small" type="primary" @click="confirmationDelivery"
             >确认提货</el-button
           >
           <el-button
-            v-if="~['PAYED', 'EXCEPTION'].indexOf(form.state)"
+            v-if="~['PAYED', 'EXCEPTION'].indexOf(form.status)"
             size="small"
             type="danger"
             @click="cancellationDelivery"
@@ -436,7 +436,7 @@
           >
         </template>
         <!-- 查看 -->
-        <template v-if="~['PAYED', 'END'].indexOf(this.type) && !~['EXCEPTION'].indexOf(form.state)">
+        <template v-if="~['PAYED', 'END'].indexOf(this.type) && !~['EXCEPTION'].indexOf(form.status)">
           <el-button size="small" @click="printHtml">打印出库清单</el-button>
         </template>
       </el-row>
@@ -570,9 +570,9 @@ export default {
           id: this.item.id
         })
           .then(res => {
-            if (this.type === 3 || ~['SUBMIT'].indexOf(res.data.state)) {
+            if (this.type === 3 || ~['SUBMIT'].indexOf(res.data.status)) {
               this.disabled = true
-            } else if (~['SAVE'].indexOf(res.data.state)) {
+            } else if (~['SAVE'].indexOf(res.data.status)) {
               this.disabled = false
             }
             if (res.data.websitId) {
@@ -664,9 +664,9 @@ export default {
         id: this.item.id
       })
         .then(res => {
-          if (this.type === 3 || ~['SUBMIT'].indexOf(res.data.state)) {
+          if (this.type === 3 || ~['SUBMIT'].indexOf(res.data.status)) {
             this.disabled = true
-          } else if (~['SAVE'].indexOf(res.data.state)) {
+          } else if (~['SAVE'].indexOf(res.data.status)) {
             this.disabled = false
           }
           if (res.data.websitId) {
@@ -759,13 +759,13 @@ export default {
 
     // 生成订单并且打开支付
     createOrder() {
-      if (!this.form.id || this.form.state === 'SAVE') {
+      if (!this.form.id || this.form.status === 'SAVE') {
         this.determine(false, res => {
           partsPartssalesorderSubmit({ id: res.data.id })
             .then(res2 => {
-              if (this.type === 3 || ~['SUBMIT'].indexOf(res2.data.state)) {
+              if (this.type === 3 || ~['SUBMIT'].indexOf(res2.data.status)) {
                 this.disabled = true
-              } else if (~['SAVE'].indexOf(res2.data.state)) {
+              } else if (~['SAVE'].indexOf(res2.data.status)) {
                 this.disabled = false
               }
               this.$emit('success')

+ 11 - 11
src/views/partsManagement/accessoryWebsite/website-parts-shop-sales-manage/website-parts-shop-sales/index.vue

@@ -121,7 +121,7 @@ export default {
         },
         edit: {
           conditions: ({ row, index, column }) => {
-            return this?.greemall_user?.type == 0 && ~['SAVE', 'SUBMIT'].indexOf(row.state)
+            return this?.greemall_user?.type == 0 && ~['SAVE', 'SUBMIT'].indexOf(row.status)
           },
           click: ({ row, index, column }) => {
             this.fromPm = {
@@ -134,7 +134,7 @@ export default {
         del: {
           prompt: '确定删除吗?',
           conditions: ({ row, index, column }) => {
-            return this?.greemall_user?.type == 0 && ~['SAVE', 'CANCEL'].indexOf(row.state)
+            return this?.greemall_user?.type == 0 && ~['SAVE', 'CANCEL'].indexOf(row.status)
           },
           click: ({ row, index, column }) => {
             partsPartssalesorderDeleteById({ id: row.id })
@@ -152,33 +152,33 @@ export default {
         },
         examine: {
           name: ({ row, index, column }) => {
-            return row.state == 'SUBMIT'
+            return row.status == 'SUBMIT'
               ? '支付'
-              : row.state == 'EXCEPTION'
+              : row.status == 'EXCEPTION'
               ? '编辑'
-              : row.state == 'PAYED' && ~[0].indexOf(row.deliveryConfirmFlag)
+              : row.status == 'PAYED' && ~[0].indexOf(row.deliveryConfirmFlag)
               ? '提货'
               : ''
           },
           conditions: ({ row, index, column }) => {
             return (
               this?.greemall_user?.type == 0 &&
-              (row.state == 'SUBMIT' ||
-                row.state == 'EXCEPTION' ||
-                (row.state == 'PAYED' && ~[0].indexOf(row.deliveryConfirmFlag)))
+              (row.status == 'SUBMIT' ||
+                row.status == 'EXCEPTION' ||
+                (row.status == 'PAYED' && ~[0].indexOf(row.deliveryConfirmFlag)))
             )
           },
           click: ({ row, index, column }) => {
-            if (row.state == 'SUBMIT') {
+            if (row.status == 'SUBMIT') {
               this.rowData = row
               this.visible = true
-            } else if (row.state == 'EXCEPTION') {
+            } else if (row.status == 'EXCEPTION') {
               this.fromPm = {
                 type: 3,
                 item: { ...row }
               }
               this.showFromBool = true
-            } else if (row.state == 'PAYED' && ~[0].indexOf(row.deliveryConfirmFlag)) {
+            } else if (row.status == 'PAYED' && ~[0].indexOf(row.deliveryConfirmFlag)) {
               this.fromPm = {
                 type: 3,
                 item: { ...row }