From 52604a14680c1eced7accd53c5bf4acf50f78b7c Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 12 Jun 2023 16:47:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dialog.vue                     |  2 +-
 src/config/getData2.js                        |  6 +--
 .../workorder/work-order-assignment.vue       |  2 +-
 .../modules/workorder/work-order-query.vue    |  4 +-
 .../modules/workorder/work-report-query.vue   | 50 +++++++------------
 src/style/layout.styl                         | 16 +++---
 6 files changed, 31 insertions(+), 49 deletions(-)

diff --git a/src/components/dialog.vue b/src/components/dialog.vue
index 133c741..ef36acc 100644
--- a/src/components/dialog.vue
+++ b/src/components/dialog.vue
@@ -75,7 +75,7 @@ export default {
   border-radius: 16px;
   box-shadow: 0 1px 3px rgba(0,0,0,.3);
   box-sizing: border-box;
-  width: 65%;
+  width: 50%;
   margin-top: 15vh;
 .dialog_header
   padding: 20px 20px 10px;
diff --git a/src/config/getData2.js b/src/config/getData2.js
index 779f701..f6c8b76 100644
--- a/src/config/getData2.js
+++ b/src/config/getData2.js
@@ -80,11 +80,9 @@ export const reportQuery = (st, et, code, wcode) => post('api/produceWorkorder/r
 })
 
 // 修改报工数量
-export const updateReport = (id, report, nok, repare) => post('api/produceshiftorder/updateReport', {
+export const updateReport = (id, report) => post('api/produceshiftorder/updateReport', {
   macoperate_id: id,
-  report_qty: report,
-  nok_qty: nok,
-  repare_qty: repare
+  report_qty: report
 })
 
 // 删除报工记录
diff --git a/src/pages/modules/workorder/work-order-assignment.vue b/src/pages/modules/workorder/work-order-assignment.vue
index 31f57de..7089097 100644
--- a/src/pages/modules/workorder/work-order-assignment.vue
+++ b/src/pages/modules/workorder/work-order-assignment.vue
@@ -89,7 +89,7 @@
               </div>
             </div> -->
           </div>
-          <div v-if="type === '2'" class="form_wraper">当前操作为强制确认，确定继续操作吗？</div>
+          <div v-if="type === '2'" class="form_wraper">当前操作将强制完成工单,结束生产，确定继续操作吗？</div>
         </jxDialog>
     </div>
 </template>
diff --git a/src/pages/modules/workorder/work-order-query.vue b/src/pages/modules/workorder/work-order-query.vue
index c1c46ba..d662f6e 100644
--- a/src/pages/modules/workorder/work-order-query.vue
+++ b/src/pages/modules/workorder/work-order-query.vue
@@ -56,7 +56,7 @@
                   <th width="8%">报废数量</th>
                   <th width="8%">报修数量</th>
                   <th width="9%">开始时间</th>
-                  <th width="9%">开始时间</th>
+                  <th width="9%">结束时间</th>
               </tr>
               <tr v-for="e in dataList" :key="e.workorder_id" :class="{'selected_icon': pkId === e.workorder_id}" @click="toRadio(e)">
                   <!-- <td>
@@ -113,7 +113,7 @@ export default {
   },
   data () {
     return {
-      value1: [],
+      value1: [new Date((new Date().getTime() - 24 * 60 * 60 * 1000)), new Date((new Date().getTime() + 24 * 60 * 60 * 1000))],
       options: [],
       value: '',
       keyValue: '',
diff --git a/src/pages/modules/workorder/work-report-query.vue b/src/pages/modules/workorder/work-report-query.vue
index 070deaa..035453e 100644
--- a/src/pages/modules/workorder/work-report-query.vue
+++ b/src/pages/modules/workorder/work-report-query.vue
@@ -45,20 +45,20 @@
           <table class="filter-table">
               <tr>
                   <!-- <th width="4%"></th> -->
-                  <th width="6%">工单号</th>
-                  <th width="6%">设备</th>
-                  <th width="6%">顺序号</th>
-                  <th width="5%">班次</th>
-                  <th width="10%">物料名称</th>
-                  <th width="8%">物料规格</th>
+                  <th width="7%">工单号</th>
+                  <th width="8%">设备</th>
+                  <th width="8%">顺序号</th>
+                  <th width="7%">班次</th>
+                  <th width="12%">物料名称</th>
+                  <th width="10%">物料规格</th>
                   <th width="10%">开始时间</th>
                   <th width="10%">结束时间</th>
                   <th width="7%">电气数量</th>
                   <th width="7%">上报合格数</th>
-                  <th width="7%">上报报废数</th>
-                  <th width="7%">上报报修数</th>
-                  <th width="6%">操作工</th>
-                  <th width="5%">状态</th>
+                  <!-- <th width="7%">上报报废数</th>
+                  <th width="7%">上报报修数</th> -->
+                  <th width="7%">操作工</th>
+                  <th width="7%">状态</th>
               </tr>
               <tr v-for="e in dataList" :key="e.macoperate_id" :class="{'selected_icon': pkId === e.macoperate_id}" @click="toRadio(e)">
                   <!-- <td>
@@ -74,8 +74,8 @@
                   <td>{{e.operatetime_end}}</td>
                   <td>{{ e.dq_report_qty }}</td>
                   <td>{{e.report_qty}}</td>
-                  <td>{{e.nok_qty}}</td>
-                  <td>{{ e.repare_qty }}</td>
+                  <!-- <td>{{e.nok_qty}}</td>
+                  <td>{{ e.repare_qty }}</td> -->
                   <td>{{ e.produce_person_name }}</td>
                   <td>{{ ['生成','报工','审核'][Number(e.report_status) - 1] }}</td>
               </tr>
@@ -94,20 +94,6 @@
                 <input type="number" class="form_item__input" v-model="reportQty">
               </div>
             </div>
-            <div class="form_item">
-              <div class="form_item__label">报废数量</div>
-              <div class="form_item__content">
-                <input type="number" class="form_item__input" v-model="nokQty">
-              </div>
-            </div>
-          </div>
-          <div class="form">
-            <div class="form_item">
-              <div class="form_item__label">报修数量</div>
-              <div class="form_item__content">
-                <input type="number" class="form_item__input" v-model="repareQty">
-              </div>
-            </div>
           </div>
         </div>
       </jxDialog>
@@ -133,9 +119,9 @@ export default {
       dataList: [],
       pkId: '',
       pkObj: {},
-      reportQty: '',
-      nokQty: '',
-      repareQty: ''
+      reportQty: ''
+      // nokQty: '',
+      // repareQty: ''
     }
   },
   computed: {
@@ -193,8 +179,8 @@ export default {
         return
       }
       this.reportQty = this.pkObj.report_qty
-      this.nokQty = this.pkObj.nok_qty
-      this.repareQty = this.pkObj.repare_qty
+      // this.nokQty = this.pkObj.nok_qty
+      // this.repareQty = this.pkObj.repare_qty
       this.$refs.child.active = true
     },
     toSureDialog () {
@@ -202,7 +188,7 @@ export default {
     },
     async _updateReport () {
       try {
-        let res = await updateReport(this.pkId, this.reportQty, this.nokQty, this.repareQty)
+        let res = await updateReport(this.pkId, this.reportQty)
         this.toast(res.message)
         this.disabled1 = false
         this.$refs.child.active = false
diff --git a/src/style/layout.styl b/src/style/layout.styl
index 4cdaec1..db417d5 100644
--- a/src/style/layout.styl
+++ b/src/style/layout.styl
@@ -324,12 +324,10 @@ input::-webkit-input-placeholder
   width 100%
 .form
   width 100%
-  _fj(flex-start, flex-start)
   .form_item
-    width 48%
-    margin-bottom: 20px
+    width 100%
   .form_item+.form_item
-    margin-left 4%
+    margin-top: 20px
 .form_item__label
   width: 74px;
   text-align: left;
@@ -337,7 +335,7 @@ input::-webkit-input-placeholder
   float: left;
   font-size: 14px;
   color: #606266;
-  line-height: 30px;
+  line-height: 40px;
   padding: 0 12px 0 0;
   box-sizing: border-box;
   i
@@ -345,7 +343,7 @@ input::-webkit-input-placeholder
 .form_item__content
   width: calc(100% - 74px)
   margin-left: 74px;
-  line-height: 30px;
+  line-height: 40px;
   position: relative;
   font-size: 14px;
 .form_item__input
@@ -358,9 +356,9 @@ input::-webkit-input-placeholder
   box-sizing: border-box;
   color: #696969;
   display: inline-block;
-  font-size: 14px;
-  height: 30px;
-  line-height: 30px;
+  font-size: 17px;
+  height: 40px;
+  line-height: 40px;
   outline: none;
   padding: 0 15px;
   transition: border-color .2s cubic-bezier(.645,.045,.355,1);