Prechádzať zdrojové kódy

xzt-657,617,377,包括一些样式调整,字体大小调整

黄梓星 2 rokov pred
rodič
commit
e2eeb7e4c2

+ 13 - 3
src/views/purchase/DemandSummary/add.vue

@@ -14,6 +14,7 @@
           :data="tableList" 
           fit
           max-height="680"
+          style="font-size: 12px;"
           @selection-change="handleSelectionChange"
         >
         <el-table-column show-overflow-tooltip type="selection" width="55" />
@@ -220,13 +221,18 @@ export default {
     },
     cancelEdit() {
       this.lineDisable = true
+      let param = this.query
+      param.sumFlag = this.row.sumFlag
+      this.getDetails(param)
     },
     saveLine() {
       editSummaryMx(this.tableList).then(res => {
         if (res.code === 200) {
           this.$modal.msgSuccess("保存成功");
           this.lineDisable = true
-          this.getDetails(this.row)
+          let param = this.query
+          param.sumFlag = this.row.sumFlag
+          this.getDetails(param)
         }
       })
     },
@@ -239,7 +245,9 @@ export default {
         shutDownSummary(param).then(res => {
           if (res.code === 200) {
             this.$modal.msgSuccess("操作成功");
-            this.getDetails(this.row)
+            let param = this.query
+            param.sumFlag = this.row.sumFlag
+            this.getDetails(param)
           }
         })
       }
@@ -250,7 +258,9 @@ export default {
       reloadBatch(param).then(res => {
         if (res.code === 200) {
           this.$modal.msgSuccess("操作成功");
-          this.getDetails(this.row)
+          let param = this.query
+          param.sumFlag = this.row.sumFlag
+          this.getDetails(param)
         }
       })
       

+ 7 - 5
src/views/purchase/DemandSummary/index.vue

@@ -256,6 +256,7 @@
           show-summary
           :summary-method="getSummaries"
           max-height="550"
+          style="font-size: 12px;"
           @selection-change="handleSelectionChange"
           :key="isUpdate"
         >
@@ -291,7 +292,7 @@
           <el-table-column show-overflow-tooltip label="人工调整数" align="center" prop="artificialAdjust" width="100px"/>
           <el-table-column show-overflow-tooltip label="修改原因" align="center" prop="modifyReason" width="150px">
             <template slot-scope="scope">
-                <el-input :disabled="scope.row.status !== '1'|| lineDisable" v-model="scope.row.modifyReason"/>
+                <el-input :disabled="scope.row.status !== '1'|| lineDisable || scope.row.artificialAdjust == '0'" v-model="scope.row.modifyReason"/>
             </template>
           </el-table-column>
           <el-table-column show-overflow-tooltip label="建议采购量" align="center" prop="suggestionPurchase" width="100px"/>
@@ -349,8 +350,8 @@
           background
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
-          :current-page="1"
-          :page-sizes="[5, 10, 15, 20]"
+          :current-page="queryParams.pageNum"
+          :page-sizes="[10, 15, 20]"
           :page-size="100"
           layout="total, sizes, prev, pager, next, jumper"
           :total=total>
@@ -463,7 +464,7 @@ export default {
         demandDate: '',
         approverFinishTime: '',
         pageNum: 1,
-        pageSize: 5
+        pageSize: 10
       },
       personOptions: [],
       classOptions: [],
@@ -557,7 +558,7 @@ export default {
         demandDate: '',
         approverFinishTime: '',
         pageNum: 1,
-        pageSize: 5
+        pageSize: 10
       }
       this.getList(this.queryParams)
     },
@@ -603,6 +604,7 @@ export default {
     },
     cancelEdit() {
       this.lineDisable = true
+      this.getList(this.queryParams)
     },
     saveList() {
       editSummaryList(this.tableList).then(res => {

+ 10 - 4
src/views/purchase/MaterialClassDivision/index.vue

@@ -210,6 +210,7 @@
           :data="tableList" 
           fit
           max-height="480"
+          style="font-size: 12px;"
           @selection-change="handleSelectionChange"
         >
           <el-table-column show-overflow-tooltip type="selection" width="55" />
@@ -246,10 +247,11 @@
         </el-table>
 
         <el-pagination
+          background
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
-          :current-page="1"
-          :page-sizes="[5, 10, 15, 20]"
+          :current-page="queryParams.pageNum"
+          :page-sizes="[10, 15, 20]"
           :page-size="100"
           layout="total, sizes, prev, pager, next, jumper"
           :total=total>
@@ -316,7 +318,7 @@ export default {
         manufacturer: '',
         remark: '',
         pageNum: 1,
-        pageSize: 5
+        pageSize: 10
       },
       options: [{
         value: 'Y', label: '是',
@@ -368,7 +370,7 @@ export default {
         manufacturer: '',
         remark: '',
         pageNum: 1,
-        pageSize: 5
+        pageSize: 10
       }
       this.getList(this.queryParams)
     },
@@ -469,4 +471,8 @@ export default {
 .lines {
   margin-top: 0;
 }
+.el-pagination {
+  margin-top: 10px;
+  text-align: right;
+}
 </style>

+ 1 - 0
src/views/purchase/PurchaseDemandList/add.vue

@@ -164,6 +164,7 @@
           :data="basicForm.puDemandItemList" 
           fit
           max-height="300"
+          style="font-size: 12px;"
           @selection-change="handleSelectionChange"
         >
           <el-table-column show-overflow-tooltip type="selection"/>

+ 18 - 5
src/views/purchase/PurchaseDemandList/index.vue

@@ -163,6 +163,7 @@
           :data="tableList" 
           fit
           max-height="550"
+          style="font-size: 12px;"
           @selection-change="handleSelectionChange"
         >
           <el-table-column show-overflow-tooltip type="selection" width="55" />
@@ -199,8 +200,8 @@
           background
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
-          :current-page="1"
-          :page-sizes="[5, 10, 15, 20]"
+          :current-page="queryParams.pageNum"
+          :page-sizes="[10, 15, 20]"
           :page-size="100"
           layout="total, sizes, prev, pager, next, jumper"
           :total=total>
@@ -240,7 +241,7 @@
     </el-dialog>
 
     <!-- 模板下载新增参数 -->
-    <el-dialog title="需求模板下载" :visible.sync="download.open" width="400px">
+    <el-dialog title="需求模板下载" :visible.sync="download.open" @close="clearDownload" width="400px">
       <el-row style="margin-bottom: 20px;">
         <span style="margin-right: 10px;">需求客户</span>
         <el-select clearable size="mini" v-model="download.customer" @clear="download.customer = ''" @focus="chooseOrg('CUSTOMER_PARAM', true, '选择客户')">
@@ -350,7 +351,7 @@ export default {
         materialCode: '',
         status: '',
         pageNum: 1,
-        pageSize: 5
+        pageSize: 10
       },
       referCondition: {
         type: '',
@@ -436,7 +437,7 @@ export default {
         materialCode: '',
         status: '',
         pageNum: 1,
-        pageSize: 5
+        pageSize: 10
       }
       this.getList(this.queryParams)
     },
@@ -473,6 +474,18 @@ export default {
         this.download.open = false
       })
     },
+    // 关闭模板下载弹窗清空参数
+    clearDownload() {
+      // 模板下载参数
+      this.download =  {
+        open: false,
+        customer: '',
+        warehouse: '',
+        warehouseId: '',
+        cargoSpace: '',
+        category: ''
+      }
+    },
     handleCommand(command) {
       // alert(command)
       if(command == '模板下载') {

+ 10 - 4
src/views/purchase/deliveryAddress/index.vue

@@ -171,6 +171,7 @@
           :data="tableList" 
           fit
           max-height="480"
+          style="font-size: 12px;"
           @selection-change="handleSelectionChange"
         >
           <el-table-column show-overflow-tooltip type="selection" width="55" />
@@ -205,10 +206,11 @@
         </el-table>
 
         <el-pagination
+          background
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
-          :current-page="1"
-          :page-sizes="[5, 10, 15, 20]"
+          :current-page="queryParams.pageNum"
+          :page-sizes="[10, 15, 20]"
           :page-size="100"
           layout="total, sizes, prev, pager, next, jumper"
           :total=total>
@@ -263,7 +265,7 @@ export default {
         sendStatus: '',
         remark: '',
         pageNum: 1,
-        pageSize: 5
+        pageSize: 10
       },
       options: [{
         value: 'Y', label: '是',
@@ -322,7 +324,7 @@ export default {
         sendStatus: '',
         remark: '',
         pageNum: 1,
-        pageSize: 5
+        pageSize: 10
       }
       this.getList(this.queryParams)
     },
@@ -419,4 +421,8 @@ export default {
 .lines {
   margin-top: 0;
 }
+.el-pagination {
+  margin-top: 10px;
+  text-align: right;
+}
 </style>

+ 4 - 0
src/views/purchase/transferOrder/add.vue

@@ -244,6 +244,7 @@
           :data="materialInfo" 
           fit
           max-height="480"
+          style="font-size: 12px;"
           >
           <el-table-column show-overflow-tooltip label="行号" align="center" prop="rowno">
               <template slot-scope="scope">
@@ -389,6 +390,7 @@
           :data="receiveInfo" 
           fit
           max-height="480"
+          style="font-size: 12px;"
           >
           <el-table-column show-overflow-tooltip label="行号" align="center" prop="rowno"/>
           <el-table-column show-overflow-tooltip label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
@@ -427,6 +429,7 @@
           :data="priceList" 
           fit
           max-height="480"
+          style="font-size: 12px;"
           >
           <el-table-column show-overflow-tooltip label="行号" align="center" prop="rowno"/>
           <el-table-column show-overflow-tooltip label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
@@ -461,6 +464,7 @@
           :data="resultList" 
           fit
           max-height="480"
+          style="font-size: 12px;"
           >
           <el-table-column show-overflow-tooltip label="行号" align="center" prop="rowno"/>
           <el-table-column show-overflow-tooltip label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>

+ 6 - 1
src/views/purchase/transferOrder/index.vue

@@ -98,6 +98,7 @@
           show-summary
           highlight-current-row
           max-height="680"
+          style="font-size: 12px;"
           ref="multipleTable"
           @row-click="select"
         >
@@ -151,7 +152,7 @@
           background
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
-          :current-page="1"
+          :current-page="queryParams.pageNum"
           :page-sizes="[5, 10, 15, 20]"
           :page-size="100"
           layout="total, sizes, prev, pager, next, jumper"
@@ -164,6 +165,7 @@
             :data="materialInfo" 
             fit
             max-height="380"
+            style="font-size: 12px;"
             >
             <el-table-column show-overflow-tooltip label="行号" align="center" prop="rowno"/>
             <el-table-column show-overflow-tooltip label="物料编码" align="center" prop="materialCode" width="150px"/>
@@ -208,6 +210,7 @@
             :data="receiveInfo" 
             fit
             max-height="380"
+            style="font-size: 12px;"
             >
             <el-table-column show-overflow-tooltip label="行号" align="center" prop="rowno"/>
             <el-table-column show-overflow-tooltip label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
@@ -246,6 +249,7 @@
             :data="priceList" 
             fit
             max-height="380"
+            style="font-size: 12px;"
             >
             <el-table-column show-overflow-tooltip label="行号" align="center" prop="rowno"/>
             <el-table-column show-overflow-tooltip label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
@@ -280,6 +284,7 @@
             :data="resultList" 
             fit
             max-height="380"
+            style="font-size: 12px;"
             >
             <el-table-column show-overflow-tooltip label="行号" align="center" prop="rowno"/>
             <el-table-column show-overflow-tooltip label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>