Finish Hotfix-mo-104

src/components/Common/export-button.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="small" type="primary" :icon="isIcon ? 'el-icon-download':''" @click="handleExport">{{exText}}</el-button>
+    <el-button size="mini" type="primary" :icon="isIcon ? 'el-icon-download':''" @click="handleExport">{{exText}}</el-button>
   </div>
 </template>
 

src/components/Common/import-button.vue

@@ -6,7 +6,7 @@
       :http-request="handleImport"
       :file-list="importFileList"
     >
-      <el-button size="small" type="primary" :icon="isIcon ? 'el-icon-download':''" :loading="importLoading">{{ importLoading ? '导入中...' : imText }}</el-button>
+      <el-button size="mini" type="primary" :icon="isIcon ? 'el-icon-download':''" :loading="importLoading">{{ importLoading ? '导入中...' : imText }}</el-button>
     </el-upload>
   </div>
 </template>

src/styles/index.scss

@@ -61,7 +61,7 @@ div:focus {
 
 // main-container global css
 .app-container {
-  padding: 30px;
+  padding: 20px;
 }
 
 .fl {float: left;}
@@ -85,6 +85,9 @@ div:focus {
 // 筛选区域样式
 .screen-container {
   background: #ffffff;
+  .el-form-item {
+    margin-bottom: 10px;
+  }
   .top {
     height: 40px;
     .title {
@@ -105,7 +108,7 @@ div:focus {
   // 时间选择器
   .el-date-editor.el-input, .el-date-editor.el-input__inner {
     width: 100%;
-    height: 33px;
+    height: 29px;
   }
   .el-range-editor--small .el-range-separator {
     line-height: 28px;
@@ -114,14 +117,18 @@ div:focus {
   .el-col:last-child .el-form-item__content {
     margin-left: 0 !important;
   }
+
+  // .el-form-item__label {
+  //   font-size: 13px;
+  // }
 }
 
 // 主要内容区域样式
 .mymain-container {
-  margin-top: 30px;
-  margin-bottom: 30px;
+  margin-top: 15px;
+  margin-bottom: 20px;
   .table {
-    margin: 20px 0;
+    margin: 15px 0;
     // .el-button {
     //   padding: 0;
     // }
@@ -130,6 +137,13 @@ div:focus {
     }
     .el-button--text {
       padding: 0;
+      font-size: 13px;
+    }
+    .el-table {
+      font-size: 13px;
+    }
+    .el-table td, .el-table th {
+      padding: 5px 0;
     }
   }
   .btn-group {
@@ -417,3 +431,18 @@ input[type=number]::-webkit-inner-spin-button, input[type=number]::-webkit-outer
   -webkit-appearance: none;
   margin: 0;
 }
+
+.main-title {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height: 50px;
+  border-bottom: 1px solid #DCDFE6;
+  margin-top: 20px;
+  margin-bottom: 20px;
+  .title {
+    font-size: 16px;
+    font-weight: 600;
+    padding-left: 10px;
+  }
+}

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

@@ -83,6 +83,13 @@
             <el-input v-model="scope.row.invoiceNum" size="small" type="number"></el-input>
           </template>
         </el-table-column>
+        <el-table-column align="center" label="仓库" prop="correspondId" min-width="140" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.correspondId" placeholder="请选择仓库" size="small" filterable clearable style="width: 100%">
+              <el-option :label="item.name" :value="item.id" v-for="(item, index) in warehouseList" :key="index"></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.remark" size="small"></el-input>
@@ -136,11 +143,21 @@
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="6" :lg="6">
+            <el-form-item prop="orderNo" label="发货单号">
+              <el-input v-model="screenForm.orderNo" placeholder="请输入发货单号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item label="规格型号" prop="model">
               <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="24" :lg="24" class="tr">
+          <el-col :xs="12" :sm="6" :lg="6">
+            <el-form-item label="产品名称" prop="goodsName">
+              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="12" :sm="12" :lg="12" class="tr">
             <el-form-item label="">
               <el-button size="small" @click="resetScreenForm">清空</el-button>
               <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
@@ -151,7 +168,7 @@
 
       <div class="table">
         <el-table :data="tableGoodsList" element-loading-text="Loading" border fit highlight-current-row stripe height="400">
-          <el-table-column align="center" label="销售出库单号" prop="id" min-width="180" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="销售出库单号" prop="id" min-width="120" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
           <!-- <el-table-column align="center" label="存货类别" prop="categoryName" min-width="100" show-overflow-tooltip></el-table-column> -->
           <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
@@ -223,7 +240,9 @@ export default {
         warehouse: '',
         type: '',
         orderNum: '',
+        orderNo: '',
         model: '',
+        goodsName: '',
       },
       currentPage: 1,
       listTotal: 0,
@@ -337,7 +356,9 @@ export default {
         correspondId: this.screenForm.warehouse,
         categoryName: this.screenForm.type,
         id: this.screenForm.orderNum,
+        orderNo: this.screenForm.orderNo,
         specification: this.screenForm.model,
+        materialName: this.screenForm.goodsName,
         saleType: 1, // 1零售，2工程
       }).then(res => {
         res.data.records.forEach(item => {
@@ -456,13 +477,19 @@ export default {
               this.$errorMsg('申请数量需为负数');
               return;
             }
+            if(!this.goodsList[i].correspondId) {
+              this.$errorMsg('请选择仓库');
+              return;
+            }
           }
           // if(!this.screenForm.warehouse) {
           //   return this.$errorMsg('请选择仓库');
           // }
           let goodsList = this.goodsList.map(item => {
+            let obj = this.warehouseList.find(o => o.id === item.correspondId);
             return {
               correspondId: item.correspondId,
+              correspondName: obj.name,
               refundableQty: item.invoiceNum,
               remark: item.remark,
               salesOrderId: item.id,

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

@@ -145,12 +145,18 @@
             <el-input v-model="scope.row.invoiceNum" size="small"></el-input>
           </template>
         </el-table-column>
+        <el-table-column align="center" label="仓库" prop="correspondId" min-width="140" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.correspondId" placeholder="请选择仓库" size="small" filterable clearable style="width: 100%">
+              <el-option :label="item.name" :value="item.id" v-for="(item, index) in warehouseList" :key="index"></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.remark" size="small"></el-input>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="操作" width="100" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" @click="deleteItem(scope.$index)">删除</el-button>
@@ -193,20 +199,30 @@
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="6">
+            <el-form-item prop="orderNo" label="发货单号">
+              <el-input v-model="screenForm.orderNo" placeholder="请输入发货单号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="12" :sm="12" :lg="6">
             <el-form-item prop="warehouse" label="选择仓库">
               <el-select v-model="screenForm.warehouse" placeholder="请选择仓库" size="small" filterable clearable :disabled="goodsList.length > 0 || tableSelection.length > 0" style="width: 100%">
                 <el-option :label="item.name" :value="item.id" v-for="(item, index) in warehouseList" :key="index"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :xs="12" :sm="6" :lg="6">
+          <el-col :xs="12" :sm="12" :lg="6">
             <el-form-item prop="type" label="存货类别">
               <el-select v-model="screenForm.type" placeholder="选择存货类别" style="width: 100%" :disabled="goodsList.length > 0">
                 <el-option v-for="item in categoryList" :key="item.name" :label="item.name" :value="item.name"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :xs="12" :sm="12" :lg="12" class="tr">
+          <el-col :xs="12" :sm="12" :lg="6">
+            <el-form-item label="产品名称" prop="goodsName">
+              <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :lg="24" class="tr">
             <el-form-item label="">
               <el-button size="small" @click="resetScreenForm">清空</el-button>
               <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
@@ -341,8 +357,10 @@ export default {
         enginName: '',
         model: '',
         orderNum: '',
+        orderNo: '',
         warehouse: '',
         type: '',
+        goodsName: '',
       },
       currentPage: 1,
       listTotal: 0,
@@ -499,6 +517,8 @@ export default {
         correspondId: this.screenForm.warehouse,
         categoryName: this.screenForm.type,
         id: this.screenForm.orderNum,
+        orderNo: this.screenForm.orderNo,
+        materialName: this.screenForm.goodsName,
         saleType: 2, // 1零售，2工程
       }).then(res => {
         let oldGoodsList = this.goodsList;
@@ -552,7 +572,7 @@ export default {
     resetScreenForm() {
       this.$refs.screenForm.resetFields();
       this.currentPage = 1;
-      this.tableGoodsList = [];
+      // this.tableGoodsList = [];
       // this.getGoodsList();
     },
 
@@ -682,13 +702,19 @@ export default {
               this.$errorMsg('申请数量需为负数');
               return;
             }
+            if(!this.goodsList[i].correspondId) {
+              this.$errorMsg('请选择仓库');
+              return;
+            }
           }
           // if(!this.screenForm.warehouse) {
           //   return this.$errorMsg('请选择仓库');
           // }
           let goodsList = this.goodsList.map(item => {
+            let obj = this.warehouseList.find(o => o.id === item.correspondId);
             return {
               correspondId: item.correspondId,
+              correspondName: obj.name,
               refundableQty: item.invoiceNum,
               remark: item.remark,
               salesOrderId: item.id,

src/views/supply/deliver/deliver_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="90px" size="small" label-position="left">
+        <el-form ref="screenForm" :model="screenForm" label-width="85px" size="mini" label-position="left">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="发货单号" prop="orderNum">
@@ -57,7 +57,7 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="业务员" prop="salesMan">
-                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" size="small" clearable filterable style="width: 100%">
+                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" clearable filterable style="width: 100%">
                   <el-option
                     v-for="item in salesmanList"
                     :key="item.adminUserId"
@@ -70,8 +70,8 @@
             
             <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
-                <el-button size="small" @click="resetScreenForm">清空</el-button>
-                <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+                <el-button size="mini" @click="resetScreenForm">清空</el-button>
+                <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -95,15 +95,15 @@
             stripe
             show-summary
             :summary-method="$getSummaries">
-            <el-table-column align="left" label="发货单号" prop="id" min-width="140" show-overflow-tooltip>
+            <el-table-column align="left" label="发货单号" prop="id" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.id" />
                 <span>{{scope.row.id}}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="发货日期" prop="orderTime" min-width="160" 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="mainOrderId" min-width="190" show-overflow-tooltip>
+            <el-table-column align="left" label="仓库" prop="correspondName" min-width="80" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="订单号" prop="mainOrderId" min-width="180" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.mainOrderId" />
                 <span>{{scope.row.mainOrderId}}</span>
@@ -115,13 +115,13 @@
                 <span>{{scope.row.customerNumber}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
                 <span>{{scope.row.customerName}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="存货类别" prop="categoryName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="存货类别" prop="categoryName" min-width="80" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialCode" />
@@ -140,7 +140,7 @@
                 <span>{{scope.row.materialName}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="180" show-overflow-tooltip>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
                 <span>{{scope.row.specification}}</span>

src/views/supply/sales/components/sales_detail.vue

@@ -171,18 +171,4 @@ export default {
     width: 100%;
     height: 100%;
   }
-  .main-title {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-top: 30px;
-    height: 60px;
-    border-bottom: 1px solid #DCDFE6;
-    margin-bottom: 20px;
-    .title {
-      font-size: 16px;
-      font-weight: 600;
-      padding-left: 10px;
-    }
-  }
 </style>

src/views/supply/sales/components/sales_return_form.vue

@@ -81,6 +81,13 @@
             <el-input v-model="scope.row.invoiceNum" size="small" type="number"></el-input>
           </template>
         </el-table-column>
+        <el-table-column align="center" label="仓库" prop="correspondId" min-width="140" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.correspondId" placeholder="请选择仓库" size="small" filterable clearable style="width: 100%">
+              <el-option :label="item.name" :value="item.id" v-for="(item, index) in warehouseList" :key="index"></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.remark" size="small"></el-input>
@@ -109,7 +116,7 @@
         <el-row :gutter="20">
           <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item prop="warehouse" label="选择仓库">
-              <el-select v-model="screenForm.warehouse" placeholder="请选择仓库" size="small" filterable clearable :disabled="goodsList.length > 0" style="width: 100%">
+              <el-select v-model="screenForm.warehouse" placeholder="请选择仓库" size="small" filterable clearable style="width: 100%">
                 <el-option :label="item.name" :value="item.id" v-for="(item, index) in warehouseList" :key="index"></el-option>
               </el-select>
             </el-form-item>
@@ -450,10 +457,17 @@ export default {
               this.$errorMsg('申请数量需为负数');
               return;
             }
+            if(!this.goodsList[i].correspondId) {
+              this.$errorMsg('请选择仓库');
+              return;
+            }
           }
           // if(!this.screenForm.warehouse) {
           //   return this.$errorMsg('请选择仓库');
           // }
+          this.goodsList.forEach(item => {
+            item.correspondName = this.warehouseList.find(o => o.id === item.correspondId).name;
+          })
 
           let params = {
             // id: this.listItem ? this.listItem.id : '',
@@ -492,18 +506,4 @@ export default {
     width: 100%;
     height: 100%;
   }
-  .main-title {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-top: 20px;
-    height: 60px;
-    border-bottom: 1px solid #DCDFE6;
-    margin-bottom: 20px;
-    .title {
-      font-size: 16px;
-      font-weight: 600;
-      padding-left: 10px;
-    }
-  }
 </style>