【修改】

src/styles/index.scss

@@ -145,31 +145,15 @@ div:focus {
   .el-table td, .el-table th {
     padding: 5px 0;
   }
+  input[type=number] {
+    text-align: right;
+  }
 }
 
 // 主要内容区域样式
 .mymain-container {
   margin-top: 15px;
   margin-bottom: 20px;
-  .table {
-    margin: 15px 0;
-    // .el-button {
-    //   padding: 0;
-    // }
-    .el-button--mini {
-      padding: 7px 10px;
-    }
-    .el-button--text {
-      padding: 0;
-      font-size: 13px;
-    }
-    .el-table {
-      font-size: 13px;
-    }
-    .el-table td, .el-table th {
-      padding: 5px 0;
-    }
-  }
   .btn-group {
     .text {
       font-size: 16px;
@@ -384,6 +368,7 @@ div:focus {
       input {
         border: none;
         padding: 0;
+        height: 34px;
       }
     }
   }

src/views/supply/apply/apply_list.vue

@@ -80,8 +80,13 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="订单号" prop="mainOrderId">
+                <el-input v-model="screenForm.mainOrderId" placeholder="请输入订单号"></el-input>
+              </el-form-item>
+            </el-col>
             
-            <el-col :xs="24" :sm="12" :lg="18" class="tr">
+            <el-col :xs="24" :sm="24" :lg="12" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
                 <el-button type="primary" @click="submitScreenForm">搜索</el-button>
@@ -331,6 +336,7 @@ export default {
         model: '',
         salesMan: '',
         orderType: '',
+        mainOrderId: '',
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -375,6 +381,7 @@ export default {
         examineStatus: this.screenForm.status,
         serviceId: this.screenForm.salesMan,
         type: this.screenForm.orderType,
+        mainOrderId: this.screenForm.mainOrderId,
       }
     },
   },
@@ -419,6 +426,7 @@ export default {
         examineStatus: this.screenForm.status,
         serviceId: this.screenForm.salesMan,
         type: this.screenForm.orderType,
+        mainOrderId: this.screenForm.mainOrderId,
       };
       getApplyList(params).then((res) => {
         res.data.records.forEach(item => {

src/views/supply/apply/components/apply_form.vue

@@ -100,7 +100,7 @@
     
     <div class="page-footer">
       <div class="footer">
-        <el-button type="primary" @click="clickSubmitForm('SAVE')">保 存</el-button>
+        <!-- <el-button type="primary" @click="clickSubmitForm('SAVE')">保 存</el-button> -->
         <el-button type="primary" @click="clickSubmitForm('WAIT')">提交审核</el-button>
         <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;">
           <el-button slot="reference">关 闭</el-button>

src/views/supply/apply/components/apply_return_form.vue

@@ -390,7 +390,7 @@ export default {
         saleType: 1, // 1零售，2工程
       }).then(res => {
         res.data.records.forEach(item => {
-          item.invoiceNum = '-' + item.invoiceNum;
+          item.invoiceNum = 0;
         })
         let oldGoodsList = this.goodsList;
         let newGoodsList = res.data.records;

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

@@ -160,7 +160,7 @@
     
     <div class="page-footer">
       <div class="footer" :class="classObj">
-        <el-button type="primary" @click="clickSubmitForm('SAVE')">保 存</el-button>
+        <!-- <el-button type="primary" @click="clickSubmitForm('SAVE')">保 存</el-button> -->
         <el-button type="primary" @click="clickSubmitForm('WAIT')">提交审核</el-button>
         <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;">
           <el-button slot="reference">关 闭</el-button>

src/views/supply/apply/components/engin_return_form.vue

@@ -562,7 +562,7 @@ export default {
           }
         }
         newGoodsList.forEach(item => {
-          item.invoiceNum = '-' + item.refundableQty;
+          item.invoiceNum = 0;
         });
 
         this.tableGoodsList = newGoodsList;

src/views/supply/apply/engin_list.vue

@@ -80,8 +80,13 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="订单号" prop="mainOrderId">
+                <el-input v-model="screenForm.mainOrderId" placeholder="请输入订单号"></el-input>
+              </el-form-item>
+            </el-col>
             
-            <el-col :xs="24" :sm="12" :lg="18" class="tr">
+            <el-col :xs="24" :sm="24" :lg="12" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
                 <el-button type="primary" @click="submitScreenForm">搜索</el-button>
@@ -338,6 +343,7 @@ export default {
         model: '',
         salesMan: '',
         orderType: '',
+        mainOrderId: '',
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -382,6 +388,7 @@ export default {
         examineStatus: this.screenForm.status,
         serviceId: this.screenForm.salesMan,
         type: this.screenForm.orderType,
+        mainOrderId: this.screenForm.mainOrderId,
       }
     },
   },
@@ -426,6 +433,7 @@ export default {
         examineStatus: this.screenForm.status,
         serviceId: this.screenForm.salesMan,
         type: this.screenForm.orderType,
+        mainOrderId: this.screenForm.mainOrderId,
       };
       getEnginList(params).then((res) => {
         res.data.records.forEach(item => {

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

@@ -76,7 +76,7 @@
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="跨区厂编号" prop="factoryNum">
-            <el-input v-model="mainForm.factoryNum" placeholder="请输入跨区厂编号"></el-input>
+            <el-input v-model="mainForm.factoryNum" placeholder="请输入跨区厂编号" :disabled="isDealer"></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
@@ -296,7 +296,7 @@
 
     <div class="page-footer">
       <div class="footer">
-        <el-button type="primary" @click="clickSubmitForm(1)">保 存</el-button>
+        <!-- <el-button type="primary" @click="clickSubmitForm(1)">保 存</el-button> -->
         <el-button type="primary" @click="clickSubmitForm(2)">提交审核</el-button>
         <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px;">
           <el-button slot="reference">关 闭</el-button>

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

@@ -70,7 +70,7 @@
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="跨区厂编号" prop="factoryNum">
-            <el-input v-model="mainForm.factoryNum" placeholder="请输入跨区厂编号"></el-input>
+            <el-input v-model="mainForm.factoryNum" placeholder="请输入跨区厂编号" :disabled="isDealer"></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
@@ -112,17 +112,17 @@
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="第几次申报" prop="declareNo">
-            <el-input v-model="mainForm.declareNo" placeholder="请输入第几次申报"></el-input>
+            <el-input v-model="mainForm.declareNo" placeholder="请输入第几次申报" :disabled="isDealer"></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="16">
           <el-form-item label="项目说明" prop="projectRemark">
-            <el-input v-model="mainForm.projectRemark" placeholder="请输入项目说明"></el-input>
+            <el-input v-model="mainForm.projectRemark" placeholder="请输入项目说明" :disabled="isDealer"></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="项目类型" prop="projectType">
-            <el-input v-model="mainForm.projectType" placeholder="请输入项目类型"></el-input>
+            <el-input v-model="mainForm.projectType" placeholder="请输入项目类型" :disabled="isDealer"></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="24" v-if="!isDealer">

src/views/supply/reserve/reserve_list.vue

@@ -157,9 +157,9 @@
               </template>
             </el-table-column>
             <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="right" label="预约数量" prop="oldNum" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="right" label="可发货数量" prop="reservedNum" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="right" label="开单数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="预留数量" prop="oldNum" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="发货数量" prop="reservedNum" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="订单数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="预留仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>