Merge branch 'master' into develop

src/views/supply/engin/commerce_list.vue

@@ -194,10 +194,7 @@
                     icon="el-icon-edit"
                     style="padding: 0; margin-left: 6px"
                     @click="editDate(scope.row)"
-                    v-if="
-                      $checkBtnRole('date', $route.meta.roles) &&
-                      (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'WAIT')
-                    "
+                    v-if="$checkBtnRole('date', $route.meta.roles) && !isCustomer && scope.row.examineStatus !== 'SAVE'"
                   ></el-button>
                 </div>
               </template>
@@ -620,6 +617,9 @@ export default {
 
         enginOrderType: 'TRADE' // TRADE=商用 HOME=家用
       }
+    },
+    isCustomer() {
+      return this.$store.getters.customerId && this.$store.getters.customerNumber
     }
   },
 

src/views/supply/engin/home_list.vue

@@ -259,10 +259,7 @@
                 <div>
                   <span>{{ scope.row.orderDate }}</span>
                   <el-button
-                    v-if="
-                      $checkBtnRole('date', $route.meta.roles) &&
-                      (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'WAIT')
-                    "
+                    v-if="$checkBtnRole('date', $route.meta.roles) && !isCustomer && scope.row.examineStatus !== 'SAVE'"
                     type="text"
                     icon="el-icon-edit"
                     style="padding: 0; margin-left: 4px"
@@ -951,7 +948,8 @@ export default {
       editDateHome({
         refEnginRecordNo: this.screenForm.loginNum,
         enginOrderId: this.editId,
-        orderDate: this.dateForm.date + ' 00:00:00'
+        orderDate: this.dateForm.date + ' 00:00:00',
+        refEnginRecordNo: this.screenForm.loginNum
       }).then(res => {
         this.isShowEditDateDialog = false
         this.getList()