From 69efa794fed691aeb990325aa9ed2309f6ff8c10 Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期三, 10 十二月 2025 09:26:39 +0800
Subject: [PATCH] 工控报工修改
---
BaoGong/fjByPrd.aspx | 76 ++++++++++++++++++++++++--------------
1 files changed, 48 insertions(+), 28 deletions(-)
diff --git a/BaoGong/fjByPrd.aspx b/BaoGong/fjByPrd.aspx
index 6c3ab54..8f8cc12 100644
--- a/BaoGong/fjByPrd.aspx
+++ b/BaoGong/fjByPrd.aspx
@@ -7,7 +7,7 @@
.tableBox table {
border-collapse: collapse;
}
- .tableBox td, #tableBox th {
+ .tableBox table tr td, #tableBox th {
border: 1px solid black; padding:6px;
}
.van-tag {
@@ -35,15 +35,25 @@
.van-field--error .van-field__control, .van-field--error .van-field__control::placeholder {
color: #000 !important; padding-left:20px;
}
+ .van-number-keyboard {
+ padding-bottom:0px !important;
+ color:#000000;
+ }
+ .van-key {
+ max-height:0.76rem;
+ }
+ .van-count-down {
+ display:inline-block;
+ }
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" runat="server">
<div id="app" v-cloak>
<div ref="searchForm" id="searchForm">
<van-nav-bar
- title="瑁呴厤杞﹂棿锛�1鍙锋敞濉戞満"
+ :title="fjInfor.title"
left-text="杩斿洖"
- right-text="鏇村鎿嶄綔"
+ :right-text="fjInfor.guid.length<=0?'':'鏇村鎿嶄綔'"
left-arrow
@click-left="onClickLeft"
@click-right="showAction = true"
@@ -57,7 +67,7 @@
<table style="width:100%;">
<tr>
<td @click="getDaaList"><span class="font-remark"><font class="font-danger">*</font>宸ュ崟缂栧彿锛�</span>{{fjInfor.gdbh}}</td>
- <td><span class="font-remark">宸ュ崟鐘舵�侊細</span> <van-tag :type="fjInfor.gdzt=='W:瀹屽伐'?'success':'danger'" round >{{fjInfor.gdzt}}</van-tag></td>
+ <td><span class="font-remark">宸ュ崟鐘舵�侊細</span><van-tag :type="fjInfor.gdzt=='W:瀹屽伐'?'success':'danger'" round >{{fjInfor.gdzt}}</van-tag></td>
<td><span class="font-remark">棰勮寮�宸ワ細</span>{{fjInfor.yjkg}}</td>
</tr>
<tr>
@@ -71,20 +81,25 @@
<td><span class="font-remark">閿�鍞鍗曪細</span>{{fjInfor.xsdd}}</td>
</tr>
<tr>
- <td><span class="font-remark">宸茬敓浜ф暟锛�</span>{{fjInfor.yscs}}</td>
+ <td>
+ <div style="display:block;float:left;"><span class="font-remark">宸茬敓浜ф暟锛�</span>{{fjInfor.yscs}}</div>
+ <div style="display:block;float:right;"><span class="font-remark">宸插叆搴擄細</span>{{fjInfor.yrks}}</div>
+ </td>
<td><span class="font-remark">浜у搧鍨嬪彿锛�</span>{{fjInfor.prdModel}}</td>
<td><span class="font-remark">棣栨鎯呭喌锛�</span><van-tag :type="fjInfor.sj*1==1?'success':'danger'" round >{{fjInfor.sj*1==1?'鍚堟牸':'鏈'}}</van-tag></td>
</tr>
<tr>
- <td><span class="font-remark">宸插叆搴撴暟锛�</span>{{fjInfor.yrks}}</td>
- <td><span class="font-remark">鍓╀綑鏁伴噺锛�</span>{{fjInfor.sysl}}</td>
- <td><span class="font-remark">宸℃鎯呭喌锛�</span> <van-tag :type="fjInfor.xj*1==1?'success':'danger'" round >{{fjInfor.xj*1==1?'鍚堟牸':'鏈'}}</van-tag></td>
+ <td>
+ <div style="display:block;float:left;">
+ <span class="font-remark">鍙墦鍗版暟锛�</span>{{fjInfor.kdysl}}
+ </div>
+ <div style="display:block;float:right;">
+ <span class="font-remark">宸叉墦鏁帮細</span>{{fjInfor.ydsl}}
+ </div>
+ </td>
+ <td> <span class="font-remark">榻愬鏍囪瘑锛�</span><van-tag :type="fjInfor.qt*1==1?'success':'danger'" round >{{fjInfor.qt*1==1?'宸查綈濂�':'鏈綈濂�'}}</van-tag></td>
+ <td><span class="font-remark">宸℃鎯呭喌锛�</span><van-tag :type="fjInfor.xj*1==1?'success':'danger'" round >{{fjInfor.xj*1==1?'鍚堟牸':'鏈'}}</van-tag></td>
</tr>
- <tr>
- <td><span class="font-remark">鍙墦鍗版暟锛�</span>{{fjInfor.kdysl}}</td>
- <td><span class="font-remark">宸叉墦鏁伴噺锛�</span>{{fjInfor.ydsl}}</td>
- <td><span class="font-remark">榻愬鏍囪瘑锛�</span> <van-tag :type="fjInfor.qt*1==1?'success':'danger'" round >{{fjInfor.qt*1==1?'宸查綈濂�':'鏈綈濂�'}}</van-tag></td>
- </tr>
<tr>
<td colspan="3">
<van-row>
@@ -92,8 +107,7 @@
<van-field
error
required
- v-model="fjInfor.bzsl"
- name="bzsl"
+ v-model="fjInfor.bzsl*1"
label="鍖呰鏁伴噺"
placeholder=""
@touchstart.native.stop="showPhone = true"
@@ -104,21 +118,28 @@
name="stepper"
label="鎵撳嵃寮犳暟"
error
- required min="1" max="2" integer >
+ required>
<template #input>
- <van-stepper style="margin-left:30px;" v-model="fjInfor.dyzs" disable-input></van-stepper>
+ <van-stepper style="margin-left:30px;" v-model="fjInfor.dyzs*1" disable-input min="1" max="1" integer ></van-stepper>
</template>
</van-field>
</van-col>
<van-col span="12">
- <van-button round block type="info" native-type="submit" style="margin-top:5px;" >纭畾鎵撶爜鎶ュ伐</van-button>
- <van-button round block type="danger" style="margin-top:5px;" color="linear-gradient(to right, #ff6034, #ee0a24)">璺濈涓嬩竴娆℃姤宸ユ椂闂磋繕鏈�20绉掞紝濡傛灉浣犳兂绱ф�ユ姤宸ワ紝璇风偣鍑诲垏鎹㈣处鍙�</van-button>
+ <van-button @click="onBaoGongSubmit" :disabled="isButtonDisabled" round block type="info" native-type="submit" style="margin-top:5px;">纭畾鎵撶爜鎶ュ伐</van-button>
+ <van-button :disabled="!isButtonDisabled" @click="onClickLogin()" round block type="danger" style="margin-top:5px;" color="linear-gradient(to right, #ff6034, #ee0a24)">璺濈涓嬫鎶ュ伐杩樻湁
+ <van-count-down
+ ref="countDown"
+ :time="fjInfor.yssj*1"
+ :auto-start="true"
+ format="mm鍒唖s绉�"
+ @finish="djsFinish"
+ ></van-count-down>
+ 濡傛灉鎯崇揣鎬ユ姤宸ワ紝璇风偣鍑诲垏鎹㈣处鍙�</van-button>
</van-col>
</van-row>
</td>
</tr>
</table>
-
<div class="font-size" style=" font-weight:bold;padding:2px;color:#1989fa">鏉＄爜鏄庣粏</div>
<div class="font-size tableBox">
<table style="width:100%;">
@@ -143,7 +164,7 @@
<td>{{item.bgr}}</td>
<td>{{item.bgrDate}}</td>
<td>
- <van-button type="info" size="mini" icon="plus" round >閲嶆墦</van-button>
+ <van-button @click="print2(item,1)" type="info" size="mini" icon="plus" round >閲嶆墦</van-button>
</td>
</tr>
</table>
@@ -156,7 +177,7 @@
{{item.gdbh}}
锛坽{item.gdzt}}锛�
<%-- 锛坽{item.prdNo}}锛�--%>
- <div class="font-remark"> {{item.prdName}}</div>
+ <div class="font-remark">{{item.prdName}}</div>
</van-button>
</div>
</van-popup>
@@ -172,22 +193,21 @@
:actions="actions"
cancel-text="鍙栨秷"
close-on-click-action
- ></van-action-sheet>
+ @select="onSelect"></van-action-sheet>
<van-number-keyboard
- v-model="fjInfor.bzsl"
+ v-model="fjInfor.bzsl.toString()"
:show="showPhone"
@blur="showPhone = false"
theme="custom"
- extra-key="."
- close-button-text="瀹屾垚"
- ></van-number-keyboard>
+ extra-key="."
+ close-button-text="瀹屾垚"></van-number-keyboard>
</div>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" runat="server">
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" runat="server">
- <script src="/Scripts/element-resize-detector.min.js?<%=WebApp.Utility.GetJsVersion() %>"></script>
+ <script src="/BaoGong/Scripts/element-resize-detector.min.js?<%=WebApp.Utility.GetJsVersion() %>"></script>
<script src="js/fjByPrd.js?<%=WebApp.Utility.GetJsVersion() %>"></script>
</asp:Content>
\ No newline at end of file
--
Gitblit v1.9.3