Finish Hotfix-mo-169

src/views/supply/deliver/sum_list.vue

@@ -286,7 +286,7 @@
       <div class="pagination clearfix">
         <div class="fr">
           <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-            :current-page="currentPage" :page-sizes="[10, 20, 30, 50]" :page-size="10"
+            :current-page="currentPage" :page-sizes="[10, 20, 50, 100, 500, 1000, 2000]" :page-size="10"
             layout="total, sizes, prev, pager, next, jumper" :total="listTotal">
           </el-pagination>
         </div>

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

@@ -713,6 +713,7 @@ export default {
         this.mainForm.remark = data.remark;
         this.mainForm.geLiInerNote = data.geLiInerNote;
         this.mainForm.geLiNote = data.geLiNote;
+        this.mainForm.fileNo = data.fileNo;
 
         this.goodsList = data.items.map(item => {
           return {

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

@@ -128,11 +128,16 @@
             <el-input v-model="mainForm.tel" placeholder="请输入固定电话"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="24" :lg="24">
+        <el-col :xs="24" :sm="16" :lg="16">
           <el-form-item label="安装地址" prop="address">
             <el-input v-model="mainForm.address" placeholder="请输入安装地址"></el-input>
           </el-form-item>
         </el-col>
+        <el-col :xs="24" :sm="8" :lg="8">
+          <el-form-item label="文件编号" prop="fileNo">
+            <el-input v-model="mainForm.fileNo" placeholder="请输入文件编号"></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :xs="24" :sm="24" :lg="16" v-if="!isDealer">
           <el-form-item label="格力内部备注" prop="greeRemark">
             <el-input v-model="mainForm.greeRemark" placeholder="请输入格力内部备注"></el-input>
@@ -386,6 +391,7 @@ export default {
         power: '',
         greeRemark: '',
         greeReply: '',
+        fileNo: '',
       },
       mainFormRules: {
         salesMan: [{ required: true, message: '请选择业务员', trigger: 'change' }],
@@ -512,6 +518,7 @@ export default {
         this.mainForm.power = data.powerCategory;
         this.mainForm.greeRemark = data.geLiInerNote;
         this.mainForm.greeReply = data.geLiNote;
+        this.mainForm.fileNo = data.fileNo;
 
         data.items.forEach(item => {
           item.cantDel = true;
@@ -600,7 +607,7 @@ export default {
         specification: this.goodsScreenForm.proModel,
         price1: this.goodsScreenForm.price1,
         price2: this.goodsScreenForm.price2,
-            customerId:this.listItem ?this.listItem.customerId :'' ,
+        customerId:this.listItem ?this.listItem.customerId :'' ,
       }).then(res => {
         let oldGoodsList = this.goodsList;
         let newGoodsList = res.data.records;
@@ -787,6 +794,7 @@ export default {
             powerCategory: this.mainForm.power,
             geLiInerNote: this.mainForm.greeRemark,
             geLiNote: this.mainForm.greeReply,
+            fileNo: this.mainForm.fileNo,
             items: goodsList
           }
           if(type === 1) {

src/views/supply/pickup/pickup_list.vue

@@ -143,7 +143,7 @@
                   style="margin-left: 10px;"
                   :title="'确定' + (scope.row.printNum ? '作废' : '取消') +'吗？'"
                   @onConfirm="handleCancel(scope.row.id)"
-                  v-if="$checkBtnRole('refund', $route.meta.roles)" >
+                  v-if="$checkBtnRole('cancel', $route.meta.roles) && ((isDealer && !scope.row.printNum) || !isDealer)" >
                   <el-button slot="reference" type="text">{{scope.row.printNum ? '作废' : '取消'}}</el-button>
                 </el-popconfirm>
               </template>
@@ -200,6 +200,9 @@ export default {
   },
 
   computed: {
+    isDealer() {
+      return JSON.parse(localStorage.getItem("supply_user")).isCustomer
+    },
     exParams() {
       return {
         invoiceId: this.screenForm.orderNum,