Merge branch 'feature/Feature-basic_data' of https://gogs.zfire.top/zfire-front/supply-front into feature/Feature-basic_data

src/views/supply/engin/commerce_list.vue

@@ -79,7 +79,7 @@
             <el-button size="small" type="danger" icon="el-icon-minus" :disabled="multipleSelection.length < 1" @click="batchDelete()" v-if="$checkBtnRole('del', $route.meta.roles)">批量删除</el-button>
           </div>
           <div class="fr">
-            <ExportButton :exUrl="'admin/user/mch/export'" :exParams="exParams" />
+            <ExportButton :exUrl="'engin-order/export'" :exParams="exParams" />
           </div>
         </div>
         <div class="table">

src/views/supply/engin/components/home_form.vue

@@ -592,11 +592,11 @@ export default {
             saleTypeCode: saleTypeItem.saleCode,
             saleTypeName: saleTypeItem.saleName,
             materialId: item.materialId,
-            materialNumber: '',
-            materialOldNumber: item.code,
-            materialName: item.name,
+            materialNumber: item.materialNumber,
+            materialOldNumber: item.materialOldNumber,
+            materialName: item.materialName,
             specification: item.machine,
-            unit: '',
+            unit: item.unit,
             price: item.price,
             enginNum: '',
             qty: item.num,

src/views/supply/engin/home_list.vue

@@ -79,7 +79,7 @@
             <el-button size="small" type="danger" icon="el-icon-minus" :disabled="multipleSelection.length < 1" @click="batchDelete()" v-if="$checkBtnRole('del', $route.meta.roles)">批量删除</el-button>
           </div>
           <div class="fr">
-            <ExportButton :exUrl="'admin/user/mch/export'" :exParams="exParams" />
+            <ExportButton :exUrl="'engin-order/export'" :exParams="exParams" />
           </div>
         </div>
         <div class="table">

src/views/supply/sales/sales_list.vue

@@ -201,15 +201,6 @@ export default {
   },
 
   methods: {
-    // 查询按钮权限
-    checkBtnRole(value) {
-      // let btnRole = this.$route.meta.roles;
-      // if(!btnRole) {return true}
-      // let index = btnRole.indexOf(value);
-      // return index >= 0;
-      return true
-    },
-
     // 查询列表
     getList() {
       this.listLoading = true;