~kyy/LW_PdaClient.git

kyy

5 天以前 08a370a9e96e1e7772551b97c381be7d9fa61aa4

首检巡检检验方式更改

已修改4个文件

	H5/IPQC_SJ/Add.aspx	71 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	H5/IPQC_XJ/Add.aspx	84 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	H5/Js/IPQC_SJ/Add.js	46 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	H5/Js/IPQC_XJ/Add.js	42 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 H5/IPQC_SJ/Add.aspx

@@ -31,6 +31,35 @@
              border-radius: 4px;
            }

            /* 输入容器样式 */
            .input-container {
                flex: 1;
                display: flex;
                gap: 2px; /* 控制两个输入组之间的间距 */
                align-items: center;
                background: #e3edf7;
            }

            .input-group {
                display: flex;
                align-items: center;
                gap: 8px;
                flex: 1; /* 使两个输入组均分剩余空间 */
                padding: 8px 12px;
            }

            .input-tag {
                flex-shrink: 0;
            }

            .si-input-field {
                flex: 1; /* 输入框占据剩余空间 */
                width: 100%; /* 控制最大宽度 */
                background: #f7f8fa;
                border-radius: 4px;
            }



            .custom-label .van-cell__title {
              font-size: 0.28rem !important;
@@ -515,23 +544,29 @@
                         <div class="si-input__left">
                            <span class="si-input__label">检验值输入</span>
                          </div>
                          <div class="si-status__right-btns">  <!-- 修改容器类名 -->
                            <van-button 
                              type="primary" 
                              size="small"
                              class="status-btn"
                              @click="handleQualified(true)"
                            >
                              合格
                            </van-button>
                            <van-button 
                              type="danger" 
                              size="small"
                              class="status-btn"
                              @click="handleQualified(false)"
                            >
                              不合格
                            </van-button>
                          <div class="input-container">
                            <div class="input-group">
                              <van-tag color="#4CAF50">OK</van-tag>
                              <van-field
                                  v-model="okValue"
                                  placeholder="请输入"
                                  :border="false"
                                  class="si-input-field"
                                  @input="handleNumberInput1"
                                  @keyup.enter.native="getInputOK"
                              />
                            </div>
                            <div class="input-group">
                              <van-tag color="#F44336">NG</van-tag>
                              <van-field
                                  v-model="ngValue"
                                  placeholder="请输入"
                                  :border="false"
                                  class="si-input-field"
                                  @input="handleNumberInput2"
                                  @keyup.enter.native="getInputNG"
                              />
                            </div>
                          </div>
                      </div>
                    </template>
@@ -721,3 +756,5 @@






 H5/IPQC_XJ/Add.aspx

@@ -31,6 +31,34 @@
              border-radius: 4px;
            }

            /* 输入容器样式 */
            .input-container {
                flex: 1;
                display: flex;
                gap: 2px; /* 控制两个输入组之间的间距 */
                align-items: center;
                background: #e3edf7;
            }

            .input-group {
                display: flex;
                align-items: center;
                gap: 8px;
                flex: 1; /* 使两个输入组均分剩余空间 */
                padding: 8px 12px;
            }

            .input-tag {
                flex-shrink: 0;
            }

            .si-input-field {
                flex: 1; /* 输入框占据剩余空间 */
                width: 100%; /* 控制最大宽度 */
                background: #f7f8fa;
                border-radius: 4px;
            }

        </style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
@@ -257,23 +285,47 @@
                         <div class="si-input__left">
                            <span class="si-input__label">检验值输入</span>
                          </div>
                          <div class="si-status__right-btns">  <!-- 修改容器类名 -->
                            <van-button 
                              type="primary" 
                              size="small"
                              class="status-btn"
                              @click="handleQualified(true)"
                            >
                              合格
                            </van-button>
                            <van-button 
                          <!-- 水平排列的输入容器 -->
                          <div class="input-container">
                            <!-- OK输入组 -->
                            <div class="input-group">
                              <van-tag 
                                left 
                                round 
                                plain 
                                type="success" 
                                class="input-tag"
                              >OK</van-tag>
                              <van-field
                                 :ref="'okValue_' + tabActive"
                                v-model="okValue"
                                class="si-input-field"
                                placeholder="输入OK数"
                                :border="false"
                                @keyup.enter.native="getInputOK"
                                  @input="handleNumberInput1"
                              />
                            </div>

                            <!-- NG输入组 -->
                            <div class="input-group">
                              <van-tag
                                left
                                round
                                plain
                              type="danger" 
                              size="small"
                              class="status-btn"
                              @click="handleQualified(false)"
                            >
                              不合格
                            </van-button>
                                class="input-tag"
                              >NG</van-tag>
                              <van-field
                                  :ref="'ngValue_' + tabActive"
                                v-model="ngValue"
                                class="si-input-field"
                                placeholder="输入NG数"
                                :border="false"
                               @keyup.enter.native="getInputNG"
                                  @input="handleNumberInput2"
                              />
                            </div>
                          </div>
                      </div>
                    </template>

 H5/Js/IPQC_SJ/Add.js

@@ -1,4 +1,4 @@
var vm = new Vue({
var vm = new Vue({

    el: '#app',
    data: function () {
        return {
@@ -163,13 +163,54 @@
            var input = "";
            if (isQualified) { 
                // 执行合格相关逻辑
                 input = "OK-1";
                 input = "OK-999999999";

                this.addJyzIpqc(input);
            } else {
                // 执行不合格相关逻辑
                 input = "NG-1";
                this.addJyzIpqc(input);
            }
        },

        // OK数输入验证和提交

        getInputOK() {

            var that = this;

            var jys = parseFloat(that.tableData[that.tabActive].checkQyt); //检验项目的检验数



            if (!that.okValue) {

                this.$toast.fail("OK数不能为空");

                that.isLoading = false;

                return;

            }



            if (jys < parseFloat(that.okValue)) {

                that.$toast.fail("录入数量不能大于检验数！");

                that.okValue = null;

                return;

            }

            // 切换指定索引的 popup 状态

            var resultValue = "OK-" + this.okValue;

            this.addJyzIpqc(resultValue);

            that.okValue = null;

        },

        // NG数输入验证和提交

        getInputNG() {

            var that = this;

            var jys = parseFloat(that.tableData[that.tabActive].checkQyt); //检验项目的检验数



            if (!that.ngValue) {

                this.$toast.fail("NG数不能为空");

                that.isLoading = false;

                return;

            }

            if (jys < parseFloat(that.ngValue)) {

                that.$toast.fail("录入数量不能大于检验数！");

                that.ngValue = null;

                return;

            }

            // 切换指定索引的 popup 状态

            var resultValue = "NG-" + this.ngValue;

            this.addJyzIpqc(resultValue);

            that.ngValue = null;

        },
        togglePopup(index) {
            // 切换指定索引的 popup 状态
@@ -861,3 +902,4 @@
        },
    }
})



 H5/Js/IPQC_XJ/Add.js

@@ -1,4 +1,4 @@
var vm = new Vue({
var vm = new Vue({
    el: '#app',
    data: function () {
        return {
@@ -192,6 +192,46 @@
            
        },

        getInputOK() {
            var that = this;
            var jys = parseFloat(that.tableData[that.tabActive].checkQyt); //检验项目的检验数

            if (!that.okValue) {
                this.$toast.fail("OK数不能为空");
                that.isLoading = false;
                return;
            }

            if (jys < parseFloat(that.okValue)) {
                that.$toast.fail("录入数量不能大于检验数！");
                that.okValue = null;
                return;
            }
            // 切换指定索引的 popup 状态
            var resultValue = "OK-" + this.okValue;
            this.addJyzIpqc(resultValue);
            that.okValue = null;
        },
        getInputNG() {
            var that = this;
            var jys = parseFloat(that.tableData[that.tabActive].checkQyt); //检验项目的检验数

            if (!that.ngValue) {
                this.$toast.fail("NG数不能为空");
                that.isLoading = false;
                return;
            }
            if (jys < parseFloat(that.ngValue)) {
                that.$toast.fail("录入数量不能大于检验数！");
                that.ngValue = null;
                return;
            }
            // 切换指定索引的 popup 状态
            var resultValue = "NG-" + this.ngValue;
            this.addJyzIpqc(resultValue);
            that.ngValue = null;
        },

        addJyzIpqc(input) {
            var that = this;
            var guid1 = that.formData.guid;//主表id

			@@ -31,6 +31,35 @@
			border-radius: 4px;
			}

			/* 输入容器样式 */
			.input-container {
			flex: 1;
			display: flex;
			gap: 2px; /* 控制两个输入组之间的间距 */
			align-items: center;
			background: #e3edf7;
			}

			.input-group {
			display: flex;
			align-items: center;
			gap: 8px;
			flex: 1; /* 使两个输入组均分剩余空间 */
			padding: 8px 12px;
			}

			.input-tag {
			flex-shrink: 0;
			}

			.si-input-field {
			flex: 1; /* 输入框占据剩余空间 */
			width: 100%; /* 控制最大宽度 */
			background: #f7f8fa;
			border-radius: 4px;
			}



			.custom-label .van-cell__title {
			font-size: 0.28rem !important;
			@@ -515,23 +544,29 @@
			<div class="si-input__left">
			<span class="si-input__label">检验值输入</span>
			</div>
			<div class="si-status__right-btns"> <!-- 修改容器类名 -->
			<van-button
			type="primary"
			size="small"
			class="status-btn"
			@click="handleQualified(true)"
			>
			合格
			</van-button>
			<van-button
			type="danger"
			size="small"
			class="status-btn"
			@click="handleQualified(false)"
			>
			不合格
			</van-button>
			<div class="input-container">
			<div class="input-group">
			<van-tag color="#4CAF50">OK</van-tag>
			<van-field
			v-model="okValue"
			placeholder="请输入"
			:border="false"
			class="si-input-field"
			@input="handleNumberInput1"
			@keyup.enter.native="getInputOK"
			/>
			</div>
			<div class="input-group">
			<van-tag color="#F44336">NG</van-tag>
			<van-field
			v-model="ngValue"
			placeholder="请输入"
			:border="false"
			class="si-input-field"
			@input="handleNumberInput2"
			@keyup.enter.native="getInputNG"
			/>
			</div>
			</div>
			</div>
			</template>
			@@ -721,3 +756,5 @@

			@@ -31,6 +31,34 @@
			border-radius: 4px;
			}

			/* 输入容器样式 */
			.input-container {
			flex: 1;
			display: flex;
			gap: 2px; /* 控制两个输入组之间的间距 */
			align-items: center;
			background: #e3edf7;
			}

			.input-group {
			display: flex;
			align-items: center;
			gap: 8px;
			flex: 1; /* 使两个输入组均分剩余空间 */
			padding: 8px 12px;
			}

			.input-tag {
			flex-shrink: 0;
			}

			.si-input-field {
			flex: 1; /* 输入框占据剩余空间 */
			width: 100%; /* 控制最大宽度 */
			background: #f7f8fa;
			border-radius: 4px;
			}

			</style>
			</asp:Content>
			<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
			@@ -257,23 +285,47 @@
			<div class="si-input__left">
			<span class="si-input__label">检验值输入</span>
			</div>
			<div class="si-status__right-btns"> <!-- 修改容器类名 -->
			<van-button
			type="primary"
			size="small"
			class="status-btn"
			@click="handleQualified(true)"
			>
			合格
			</van-button>
			<van-button
			<!-- 水平排列的输入容器 -->
			<div class="input-container">
			<!-- OK输入组 -->
			<div class="input-group">
			<van-tag
			left
			round
			plain
			type="success"
			class="input-tag"
			>OK</van-tag>
			<van-field
			:ref="'okValue_' + tabActive"
			v-model="okValue"
			class="si-input-field"
			placeholder="输入OK数"
			:border="false"
			@keyup.enter.native="getInputOK"
			@input="handleNumberInput1"
			/>
			</div>

			<!-- NG输入组 -->
			<div class="input-group">
			<van-tag
			left
			round
			plain
			type="danger"
			size="small"
			class="status-btn"
			@click="handleQualified(false)"
			>
			不合格
			</van-button>
			class="input-tag"
			>NG</van-tag>
			<van-field
			:ref="'ngValue_' + tabActive"
			v-model="ngValue"
			class="si-input-field"
			placeholder="输入NG数"
			:border="false"
			@keyup.enter.native="getInputNG"
			@input="handleNumberInput2"
			/>
			</div>
			</div>
			</div>
			</template>

			@@ -1,4 +1,4 @@
			var vm = new Vue({
			var vm = new Vue({
			el: '#app',
			data: function () {
			return {
			@@ -163,13 +163,54 @@
			var input = "";
			if (isQualified) {
			// 执行合格相关逻辑
			input = "OK-1";
			input = "OK-999999999";
			this.addJyzIpqc(input);
			} else {
			// 执行不合格相关逻辑
			input = "NG-1";
			this.addJyzIpqc(input);
			}
			},
			// OK数输入验证和提交
			getInputOK() {
			var that = this;
			var jys = parseFloat(that.tableData[that.tabActive].checkQyt); //检验项目的检验数

			if (!that.okValue) {
			this.$toast.fail("OK数不能为空");
			that.isLoading = false;
			return;
			}

			if (jys < parseFloat(that.okValue)) {
			that.$toast.fail("录入数量不能大于检验数！");
			that.okValue = null;
			return;
			}
			// 切换指定索引的 popup 状态
			var resultValue = "OK-" + this.okValue;
			this.addJyzIpqc(resultValue);
			that.okValue = null;
			},
			// NG数输入验证和提交
			getInputNG() {
			var that = this;
			var jys = parseFloat(that.tableData[that.tabActive].checkQyt); //检验项目的检验数

			if (!that.ngValue) {
			this.$toast.fail("NG数不能为空");
			that.isLoading = false;
			return;
			}
			if (jys < parseFloat(that.ngValue)) {
			that.$toast.fail("录入数量不能大于检验数！");
			that.ngValue = null;
			return;
			}
			// 切换指定索引的 popup 状态
			var resultValue = "NG-" + this.ngValue;
			this.addJyzIpqc(resultValue);
			that.ngValue = null;
			},
			togglePopup(index) {
			// 切换指定索引的 popup 状态
			@@ -861,3 +902,4 @@
			},
			}
			})