From bac57e57656a8dc9edfc0d50605e864f388eb127 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Fri, 17 Sep 2021 15:56:37 +0800
Subject: [PATCH] =?UTF-8?q?0907=E6=9B=B4=E6=96=B0:=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/rq.scss                       | 16 ++++---------
 src/views/common/login.vue                    |  6 ++---
 .../modules/board/nextWeekShipmentBoard.vue   | 22 +++++++++--------
 .../modules/board/productionBlankingBoard.vue | 15 ++++++------
 .../modules/board/thisWeekShipmentBoard.vue   | 24 +++++++++++--------
 .../modules/production/dailyPlanReport.vue    | 12 ++++++++--
 src/views/modules/sys/role.vue                |  2 +-
 src/views/modules/sys/user-add-or-update.vue  |  6 ++---
 8 files changed, 55 insertions(+), 48 deletions(-)

diff --git a/src/assets/scss/rq.scss b/src/assets/scss/rq.scss
index 8d6746f..a4a7cd5 100644
--- a/src/assets/scss/rq.scss
+++ b/src/assets/scss/rq.scss
@@ -43,15 +43,7 @@
 .pad .el-select-dropdown__item{
   font-size: 18px;
 }
-//.board .el-table .cell {
-//  line-height: 22px;
-//  font-size: 18px;
-//  height: 22px;
-//}
-//
-//.board .el-table .success-row {
-//  background: #1bb61b;
-//}
-//.board .el-table .false-row {
-//  background: #db1212;
-//}
+
+.el-table .cell, .el-table th div, .el-table--border td:first-child .cell, .el-table--border th:first-child .cell {
+  padding-left: 0px;
+}
diff --git a/src/views/common/login.vue b/src/views/common/login.vue
index a4fa8be..5bacae2 100644
--- a/src/views/common/login.vue
+++ b/src/views/common/login.vue
@@ -14,9 +14,9 @@
             <el-form-item>
               <el-button class="login-btn-submit" type="primary" @click="dataFormSubmit()">登录</el-button>
             </el-form-item>
-            <el-form-item>
-              <el-button class="login-btn-submit" type="primary" @click="jumpPAD()">进入pad界面</el-button>
-            </el-form-item>
+<!--            <el-form-item>-->
+<!--              <el-button class="login-btn-submit" type="primary" @click="jumpPAD()">进入pad界面</el-button>-->
+<!--            </el-form-item>-->
           </el-form>
         </div>
       </div>
diff --git a/src/views/modules/board/nextWeekShipmentBoard.vue b/src/views/modules/board/nextWeekShipmentBoard.vue
index a831a6c..8045b27 100644
--- a/src/views/modules/board/nextWeekShipmentBoard.vue
+++ b/src/views/modules/board/nextWeekShipmentBoard.vue
@@ -33,28 +33,28 @@
           prop="notifyQty"
           header-align="center"
           align="right"
-          min-width="45"
+          min-width="40"
           label="需求总数">
         </el-table-column>
         <el-table-column
           prop="qtyPerBox"
           header-align="center"
           align="right"
-          min-width="45"
+          min-width="40"
           label="袋装数量">
         </el-table-column>
         <el-table-column
           prop="weightperBag"
           header-align="center"
           align="right"
-          min-width="45"
+          min-width="40"
           label="袋装重量">
         </el-table-column>
         <el-table-column
           prop="bagsperBox"
           header-align="center"
           align="right"
-          min-width="45"
+          min-width="40"
           label="每箱袋数">
         </el-table-column>
         <el-table-column
@@ -75,14 +75,14 @@
           prop="operationSz"
           header-align="center"
           align="left"
-          min-width="60"
+          min-width="70"
           label="工艺备注-烘烤">
         </el-table-column>
         <el-table-column
           prop="operationHk"
           header-align="center"
           align="left"
-          min-width="60"
+          min-width="70"
           label="工艺备注-水煮">
         </el-table-column>
         <el-table-column
@@ -174,7 +174,7 @@
       refreshTable () {
         refresher = setInterval(() => {
           this.search()
-        }, 1000000)
+        }, 600000)
       }
     },
     created () {
@@ -186,11 +186,13 @@
 
 <style >
   .board .el-table .cell {
-    line-height: 22px;
-    font-size: 18px;
-    height: 22px;
+    line-height: 13px;
+    font-size: 12px;
+    height: 13px;
+    padding: 0px;
   }
 
+
   .board .el-table .success-row {
     background: #1bb61b;
   }
diff --git a/src/views/modules/board/productionBlankingBoard.vue b/src/views/modules/board/productionBlankingBoard.vue
index e9ea55b..8f6bd44 100644
--- a/src/views/modules/board/productionBlankingBoard.vue
+++ b/src/views/modules/board/productionBlankingBoard.vue
@@ -41,7 +41,7 @@
           header-align="center"
           align="right"
           min-width="50"
-          label="混炼胶用量">
+          label="计划需求量">
         </el-table-column>
         <el-table-column
           prop="sjph1"
@@ -53,7 +53,7 @@
         <el-table-column
           prop="sjphQtyReq1"
           header-align="center"
-          align="left"
+          align="right"
           min-width="50"
           label="生胶1用量">
         </el-table-column>
@@ -67,7 +67,7 @@
         <el-table-column
           prop="sjphQtyReq2"
           header-align="center"
-          align="left"
+          align="right"
           min-width="50"
           label="生胶2用量">
         </el-table-column>
@@ -169,7 +169,7 @@
       refreshTable () {
         refresher = setInterval(() => {
           this.search()
-        }, 1000000)
+        }, 600000)
       }
     },
     created () {
@@ -181,9 +181,10 @@
 
 <style >
   .board2 .el-table .cell {
-    line-height: 25px;
-    font-size: 18px;
-    height: 25px;
+    line-height: 13px;
+    font-size: 12px;
+    height: 13px;
+    padding: 0px;
   }
 
   .board2 .el-table .success-row {
diff --git a/src/views/modules/board/thisWeekShipmentBoard.vue b/src/views/modules/board/thisWeekShipmentBoard.vue
index cb546d7..1317486 100644
--- a/src/views/modules/board/thisWeekShipmentBoard.vue
+++ b/src/views/modules/board/thisWeekShipmentBoard.vue
@@ -33,28 +33,28 @@
           prop="notifyQty"
           header-align="center"
           align="right"
-          min-width="45"
+          min-width="40"
           label="需求总数">
         </el-table-column>
         <el-table-column
           prop="qtyPerBox"
           header-align="center"
           align="right"
-          min-width="45"
+          min-width="40"
           label="袋装数量">
         </el-table-column>
         <el-table-column
           prop="weightperBag"
           header-align="center"
           align="right"
-          min-width="45"
+          min-width="40"
           label="袋装重量">
         </el-table-column>
         <el-table-column
           prop="bagsperBox"
           header-align="center"
           align="right"
-          min-width="45"
+          min-width="40"
           label="每箱袋数">
         </el-table-column>
         <el-table-column
@@ -75,14 +75,14 @@
           prop="operationSz"
           header-align="center"
           align="left"
-          min-width="60"
+          min-width="70"
           label="工艺备注-水煮">
         </el-table-column>
         <el-table-column
           prop="operationHk"
           header-align="center"
           align="left"
-          min-width="60"
+          min-width="70"
           label="工艺备注-烘烤">
         </el-table-column>
         <el-table-column
@@ -176,7 +176,7 @@
       refreshTable () {
         refresher = setInterval(() => {
           this.search()
-        }, 1000000)
+        }, 600000)
       }
     },
 
@@ -191,11 +191,15 @@
 
 <style >
   .board .el-table .cell {
-    line-height: 22px;
-    font-size: 18px;
-    height: 22px;
+    line-height: 13px;
+    font-size: 12px;
+    height: 13px;
+    padding: 0px;
   }
 
+  .el-table .cell, .el-table th div, .el-table--border td:first-child .cell, .el-table--border th:first-child .cell {
+    padding-left: 0px;
+  }
   .board .el-table .success-row {
     background: #1bb61b;
   }
diff --git a/src/views/modules/production/dailyPlanReport.vue b/src/views/modules/production/dailyPlanReport.vue
index 472f8c3..a3b7799 100644
--- a/src/views/modules/production/dailyPlanReport.vue
+++ b/src/views/modules/production/dailyPlanReport.vue
@@ -126,7 +126,7 @@
           <el-input v-model="reportData.orderNo" disabled style="width: 130px"></el-input>
         </el-form-item>
         <el-form-item :label="'报工数量：'">
-          <el-input v-model="reportData.reportQty" disabled style="width: 130px"></el-input>
+          <el-input v-model="reportData.reportQty" type="number" style="width: 130px"></el-input>
         </el-form-item>
       </el-form>
       <el-footer style="height:40px;margin-top: 20px;text-align:center">
@@ -154,6 +154,7 @@
           reportBy:this.$store.state.user.name,
           site:this.$store.state.user.site,
         },
+        needQty:0,
         height:200,
         tableData:[],
         date1:'',
@@ -188,10 +189,17 @@
           return false
         }
         this.reportData.orderNo=row.orderNo;
-        this.reportData.reportQty=row.orderQty-row.qtyfinished;
+        this.needQty=row.orderQty-row.qtyfinished;
+        this.reportData.reportQty=0;
         this.reportModalFlag=true;
       },
       reportSave(){
+        if(this.reportData.reportQty<this.needQty){
+          this.$alert('报工数量小于计划数量无法报工！', '错误', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
         dailyPlanReportSave(this.reportData).then(({data}) => {
           if (data && data.code === 0) {
             this.search()
diff --git a/src/views/modules/sys/role.vue b/src/views/modules/sys/role.vue
index 808e77e..4b2ac15 100644
--- a/src/views/modules/sys/role.vue
+++ b/src/views/modules/sys/role.vue
@@ -147,7 +147,7 @@
         var ids = id ? [id] : this.dataListSelections.map(item => {
           return item.roleId
         })
-        this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
+        this.$confirm(`确定删除此角色记录？`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue
index 8b27c10..515cef7 100644
--- a/src/views/modules/sys/user-add-or-update.vue
+++ b/src/views/modules/sys/user-add-or-update.vue
@@ -36,8 +36,8 @@
           </el-form-item>
         </el-form>
         <el-form>
-          <el-form-item label="语言" prop="languageDefault">
-            <el-select filterable v-model="dataForm.languageDefault" clearable>
+          <el-form-item label="语言" prop="languageDefault" >
+            <el-select filterable v-model="dataForm.languageDefault" clearable disabled="true">
               <el-option :label="item.languageName" :value="item.languageCode" v-for="(item,index) in languageList "
                          :key="index"></el-option>
             </el-select>
@@ -94,7 +94,7 @@ export default {
         mobile: '',
         roleIdList: [],
         status: 1,
-        site: 0
+        site: '2'
       }
     }
   },