From a9ef032eb52b038f6603fb5ccdc4ea976d8e8620 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 25 三月 2025 17:21:24 +0800
Subject: [PATCH] 1.首检检验查询、刷新检验 2.显示字段调整
---
/dev/null | 242 ----------------------------------------
H5/Js/IPQC_SJ/List.js | 2
H5/IPQC_SJ/List.aspx | 18 +-
H5/IPQC_SJ/Add.aspx | 42 +++---
H5/Js/IPQC_SJ/Add.js | 2
5 files changed, 33 insertions(+), 273 deletions(-)
diff --git a/H5/IPQC_SJ/Add.aspx b/H5/IPQC_SJ/Add.aspx
index 76621a3..818c573 100644
--- a/H5/IPQC_SJ/Add.aspx
+++ b/H5/IPQC_SJ/Add.aspx
@@ -49,20 +49,20 @@
<template #title>
<div class="inline-title">
<span class="release-no">{{ formData.releaseNo }}</span>
- <van-tag round plain v-if="formData.fcheckResu === '涓嶅悎鏍�'" type="danger">涓嶅悎鏍�</van-tag>
- <van-tag round plain v-else-if="formData.fcheckResu === '妫�楠屼腑'" type="warning">妫�楠屼腑</van-tag>
- <van-tag round plain v-else-if="formData.fcheckResu === '鏈楠�'" type="warning">鏈楠�</van-tag>
- <van-tag round plain v-else-if="formData.fcheckResu === ''" type="warning">鏈楠�</van-tag>
- <van-tag round plain v-else-if="formData.fcheckResu === '鍚堟牸'" type="warning">鍚堟牸</van-tag>
+ <van-tag round plain v-if="formData.fCheckResu === '涓嶅悎鏍�'" type="danger">涓嶅悎鏍�</van-tag>
+ <van-tag round plain v-else-if="formData.fCheckResu === '妫�楠屼腑'" type="warning">妫�楠屼腑</van-tag>
+ <van-tag round plain v-else-if="formData.fCheckResu === '鏈楠�'" type="warning">鏈楠�</van-tag>
+ <van-tag round plain v-else-if="formData.fCheckResu === ''" type="warning">鏈楠�</van-tag>
+ <van-tag round plain v-else-if="formData.fCheckResu === '鍚堟牸'" type="warning">鍚堟牸</van-tag>
<van-tag round plain v-else type="danger">寮傚父鐘舵��</van-tag>
<%-- <van-tag round plain
- :type="formData.fcheckResu === '涓嶅悎鏍�' ? 'danger' :
- formData.fcheckResu === '妫�楠屼腑' ? 'warning' :
- formData.fcheckResu === '鏈楠�' ? 'warning' :
- formData.fcheckResu === '鍚堟牸' ? 'success' :'danger'"
+ :type="formData.fCheckResu === '涓嶅悎鏍�' ? 'danger' :
+ formData.fCheckResu === '妫�楠屼腑' ? 'warning' :
+ formData.fCheckResu === '鏈楠�' ? 'warning' :
+ formData.fCheckResu === '鍚堟牸' ? 'success' :'danger'"
class="status-tag"
>
- {{ formData.fcheckResu }}
+ {{ formData.fCheckResu }}
</van-tag>--%>
</div>
</template>
@@ -85,6 +85,8 @@
<van-field label="鍒涘缓浜�" colon="true" v-model="formData.createBy" readonly ></van-field>--%>
<van-field label="鐗╂枡缂栫爜" colon="true" v-model="formData.itemNo" readonly ></van-field>
<van-field label="鐗╂枡鍚嶇О" colon="true" v-model="formData.itemName" readonly ></van-field>
+ <van-field label="鐢熶骇杞﹂棿" colon="true" v-model="formData.departmentName" readonly ></van-field>
+ <van-field label="鐢熶骇绾垮埆" colon="true" v-model="formData.xtName" readonly ></van-field>
<%--<van-field label="瑙勬牸鍨嬪彿" colon="true" v-model="formData.itemModel" readonly ></van-field>--%>
<van-field
label="瑙勬牸鍨嬪彿"
@@ -97,8 +99,8 @@
<div class="wrap-content">{{ formData.itemModel }}</div>
</template>
</van-field>
- <van-field label="鏁伴噺" colon="true" v-model="formData.fcovertQty" readonly ></van-field>
- <van-field label="涓嶅悎鏍兼弿杩�" v-if='formData.fcheckResu == "涓嶅悎鏍�"' colon v-model="remarks" readonly class="wrap-field">
+<%-- <van-field label="鏁伴噺" colon="true" v-model="formData.fcovertQty" readonly ></van-field>--%>
+ <van-field label="涓嶅悎鏍兼弿杩�" v-if='formData.fCheckResu == "涓嶅悎鏍�"' colon v-model="remarks" readonly class="wrap-field">
<template #input>
<div class="wrap-content">{{ remarks }}</div>
</template>
@@ -107,7 +109,7 @@
</template>
</van-field>
<%-- <van-field
- v-if='formData.fcheckResu == "涓嶅悎鏍�"' colon="true"
+ v-if='formData.fCheckResu == "涓嶅悎鏍�"' colon="true"
v-model="formData.remarks"
rows="2"
autosize
@@ -177,11 +179,11 @@
</van-col>
<van-col center span="6" >
<van-cell center
- center v-if="item.fcheckResu === '鍚堟牸'">
+ center v-if="item.fCheckResu === '鍚堟牸'">
<van-tag round plain type="success" style="font-size:15px" @click="togglePopup(index)">鍚堟牸</van-tag>
</van-cell>
<van-cell center
- center v-else-if="item.fcheckResu === '涓嶅悎鏍�'">
+ center v-else-if="item.fCheckResu === '涓嶅悎鏍�'">
<van-tag round plain type="danger" style="font-size:15px" @click="togglePopup(index)">涓嶅悎鏍�</van-tag>
</van-cell>
<van-cell center
@@ -230,8 +232,8 @@
<van-field label="妫�娴嬬粨鏋�" colon="true" readonly >
<template #input>
- <van-tag round plain v-if="jymxData.fcheckResu === '鍚堟牸'" type="success">鍚堟牸</van-tag>
- <van-tag round plain v-else-if="jymxData.fcheckResu === '涓嶅悎鏍�'" type="danger">涓嶅悎鏍�</van-tag>
+ <van-tag round plain v-if="jymxData.fCheckResu === '鍚堟牸'" type="success">鍚堟牸</van-tag>
+ <van-tag round plain v-else-if="jymxData.fCheckResu === '涓嶅悎鏍�'" type="danger">涓嶅悎鏍�</van-tag>
<van-tag round plain v-else type="warning">妫�楠屼腑</van-tag>
</template>
</van-field>
@@ -281,7 +283,7 @@
</div>
</template>
<van-row type="flex" justify="center">
- <van-col span="6">鏍锋湰闆�</van-col>
+ <van-col span="6"></van-col>
<van-col span="6">妫�楠屽��</van-col>
<van-col span="6">鍒ゅ畾鏍囧織</van-col>
<van-col span="6">鎿嶄綔</van-col>
@@ -294,7 +296,7 @@
</van-col>
<van-col span="6" >
<van-cell center
- center :title="item.fcheckResu"></van-cell>
+ center :title="item.fCheckResu"></van-cell>
</van-col>
<van-col center span="6" >
<van-cell center
@@ -354,5 +356,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="../Js/IPQC_SJ/Add.js?<%=11 %>"></script>
+ <script src="../Js/IPQC_SJ/Add.js?<%=12 %>"></script>
</asp:Content>
diff --git a/H5/IPQC_SJ/List.aspx b/H5/IPQC_SJ/List.aspx
index 503469a..50049e3 100644
--- a/H5/IPQC_SJ/List.aspx
+++ b/H5/IPQC_SJ/List.aspx
@@ -67,17 +67,17 @@
<van-field label="鐗╂枡缂栫爜" colon="true" v-model="item.itemNo" readonly ></van-field>
<van-field label="鐗╂枡鍚嶇О" colon="true" v-model="item.itemName" readonly ></van-field>
<%--<van-field label="瑙勬牸鍨嬪彿" colon="true" v-model="item.itemModel" readonly ></van-field>--%>
- <van-field label="鐢熶骇杞﹂棿" colon="true" v-model="item.fbatchQty" readonly ></van-field>
- <van-field label="鐢熶骇绾垮埆" colon="true" v-model="item.suppName" readonly ></van-field>
+ <van-field label="鐢熶骇杞﹂棿" colon="true" v-model="item.departmentName" readonly ></van-field>
+ <van-field label="鐢熶骇绾垮埆" colon="true" v-model="item.xtName" readonly ></van-field>
<%--<van-field label="妫�楠屼汉" colon="true" v-model="item.fcheckBy" readonly ></van-field>--%>
<van-field label="妫�娴嬬粨鏋�" colon="true" readonly >
<template #input>
- <van-tag round plain v-if="item.fcheckResu === '涓嶅悎鏍�'" type="danger">涓嶅悎鏍�</van-tag>
- <van-tag round plain v-else-if="item.fcheckResu === '妫�楠屼腑'" type="warning">妫�楠屼腑</van-tag>
- <van-tag round plain v-else-if="item.fcheckResu === '鏈楠�'" type="warning">鏈楠�</van-tag>
- <van-tag round plain v-else-if="item.fcheckResu === ''" type="warning">鏈楠�</van-tag>
- <van-tag round plain v-else-if="item.fcheckResu === '鍚堟牸'" type="warning">鍚堟牸</van-tag>
+ <van-tag round plain v-if="item.fCheckResu === '涓嶅悎鏍�'" type="danger">涓嶅悎鏍�</van-tag>
+ <van-tag round plain v-else-if="item.fCheckResu === '妫�楠屼腑'" type="warning">妫�楠屼腑</van-tag>
+ <van-tag round plain v-else-if="item.fCheckResu === '鏈楠�'" type="warning">鏈楠�</van-tag>
+ <van-tag round plain v-else-if="item.fCheckResu === ''" type="warning">鏈楠�</van-tag>
+ <van-tag round plain v-else-if="item.fCheckResu === '鍚堟牸'" type="warning">鍚堟牸</van-tag>
<van-tag round plain v-else type="danger">寮傚父鐘舵��</van-tag>
</template>
</van-field>
@@ -117,7 +117,7 @@
<van-field label="鏁伴噺" colon="true" v-model="item.fcovertQty" readonly ></van-field>
<van-field label="渚涘簲鍟�" colon="true" v-model="item.suppName" readonly ></van-field>
<van-field label="妫�楠屼汉" colon="true" v-model="item.fcheckBy" readonly ></van-field>
- <van-field label="妫�娴嬬粨鏋�" colon="true" v-model="item.fcheckResu" readonly ></van-field>
+ <van-field label="妫�娴嬬粨鏋�" colon="true" v-model="item.fCheckResu" readonly ></van-field>
</van-cell-group>
</div>
</van-cell>
@@ -132,5 +132,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="../Js/IPQC_SJ/List.js?<%=116 %>"></script>
+ <script src="../Js/IPQC_SJ/List.js?<%=1 %>"></script>
</asp:Content>
diff --git a/H5/Js/IPQC_SJ/Add.js b/H5/Js/IPQC_SJ/Add.js
index 00bb2ff..faa203f 100644
--- a/H5/Js/IPQC_SJ/Add.js
+++ b/H5/Js/IPQC_SJ/Add.js
@@ -264,7 +264,7 @@
//alert(this.Request("id"));
var that = this;
that.showButton = false;
- that.AxiosHttp("post", 'LLJ/getPage', {
+ that.AxiosHttp("post", 'Ipqc/getPageSj', {
id: that.Request("id"),
pageIndex: 1,
limit: 1,
diff --git a/H5/Js/IPQC_SJ/List.js b/H5/Js/IPQC_SJ/List.js
index d961e1e..4e2341d 100644
--- a/H5/Js/IPQC_SJ/List.js
+++ b/H5/Js/IPQC_SJ/List.js
@@ -57,7 +57,7 @@
this.pageIndex++;
var that = this;
- that.AxiosHttp("post", 'LLJ/getPage', {
+ that.AxiosHttp("post", 'Ipqc/getPageSj', {
pageIndex: that.pageIndex,
limit: that.limit,
createUser: that.userInfo.loginAccount,
diff --git a/H5/Js/IPQC_SJ/detail.js b/H5/Js/IPQC_SJ/detail.js
deleted file mode 100644
index 53860c3..0000000
--- a/H5/Js/IPQC_SJ/detail.js
+++ /dev/null
@@ -1,242 +0,0 @@
-锘縱ar vm = new Vue({
- el: '#app',
- data: function () {
- return {
- isLoading: false,
- userInfo: {
- "loginGuid": '',
- "loginAccount": '',
- },
- formData: {},
- isNumber: false,
- checkItem: "",
- id: 0,
- gid: 0,
- itemInId: 0,
- billNo: "",
- showPopup: false,
- editData: {},
- tableData: [],
- isShowImg: false,
- base64Image: "",
- remarks: "",
- remarksPopup: false,
- fcheckResu: null,
- fsubmit:1
- }
- },
- mounted() {
- var that = this;
- this.userInfo = {
- loginGuid: this.GetLoginInfor().loginGuid,
- loginAccount: this.GetLoginInfor().loginAccount,
- };
- this.id = this.Request("id");
- this.gid = this.Request("gid");
- this.fsubmit = this.Request("fsubmit");
-
- this.refreshResult();
- },
- methods: {
- refreshResult() {
-
- var that = this;
- that.AxiosHttp("post", 'LLJ/getXjDetail02ById', {
- id: this.id
- }, false)
- .then(function (res) {
- that.formData = res.data.tbBillList.itemXj01;
-
- that.tableData = res.data.tbBillList.itemXj02s;
-
- //if (this.formData.imageData) {
- // this.isShowImg = true;
- // this.base64Image = 'data:image/jpeg;base64,' + this.formData.imageData;
- //}
-
- //fupAllow fdownAllow standardValue
- if (that.formData.fupAllow && that.formData.fdownAllow && that.formData.fstand) {
- that.isNumber = true;
- }
- })
- .catch(function (error) {
- that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
- console.log(error);
- });
- },
- submit() {
- let count = this.formData.checkQyt;
- let fstand = "鈭�";
-
- //鏈夋渶澶у�煎拰鏈�灏忓�煎氨鏍规嵁鏄惁绗﹀悎鏍囧噯鍊兼洿鏂板垽瀹氱粨鏋滐紝娌℃湁鏈�澶у�煎拰鏈�灏忓�煎氨鏍规嵁鏄惁閫氳繃妫�楠屽垽瀹氱粨鏋�
- if (this.formData.fupAllow && this.formData.fdownAllow) {
-
- if (!this.formData.fcheckResu) {
- this.$toast.fail("璇疯緭鍏ユ楠屽��");
- return;
- }
-
- let max = Number(this.formData.fupAllow);
- let min = Number(this.formData.fdownAllow);
-
- if (this.formData.fcheckResu >= min && this.formData.fcheckResu <= max) {
- fstand = "鈭�"
- } else {
- fstand = "脳";
- }
- count = 1;
- } else {
-
- if (!this.formData.fcheckResu) {
- this.formData.fcheckResu = 1
- }
-
- if (this.formData.fcheckResu == 0 || this.formData.fcheckResu == 1) {
- this.formData.isPass = this.formData.fcheckResu
- } else {
- this.$toast.fail("鏃犳爣鍑嗗�兼椂锛屾楠岀粨鏋滃彧鑳戒负0鎴�1!");
- return;
- }
- count = count - this.tableData.length;
- }
-
- this.formData.updater = this.userInfo.loginAccount;
-
- var that = this;
- that.AxiosHttp("post", 'LLJ/SetQSItemDetail', {
- parentGuid: that.id,
- grandpaGuid: that.gid,
- fstand: fstand,
- fcheckItem: that.formData.fcheckItem,
- fcheckResu: that.formData.fcheckResu,
- lastupdateBy: that.formData.updater,
- count: count
- }, false)
- .then(function (res) {
- that.formData.fcheckResu = null;
- that.$notify({ type: 'success', message: '淇濆瓨鎴愬姛' });
- that.refreshResult();
- })
- .catch(function (error) {
- that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
- console.log(error);
- });
- },
- toDetail(item) {
- this.showPopup = !this.showPopup;
- this.editData = item;
- },
- editResult(fcheckResu) {
- if (fcheckResu == 'OK') {
- return "鏀逛负涓嶅悎鏍�";
- } else {
- return "鏀逛负鍚堟牸";
- }
- },
- numberEdit(item) {
-
- let fstand = "鈭�";
- let fcheckResu = "OK";
-
- if (item.fcheckResu == 'OK') {
- fstand = "脳";
- fcheckResu = "NG";
- }
-
- var that = this;
- that.AxiosHttp("post", 'LLJ/UpdateQSItemDetail', {
- guid: item.guid,
- parentGuid: item.parentGuid,
- grandpaGuid: item.grandpaGuid,
- fstand: fstand,
- fcheckResu: fcheckResu,
- lastupdateBy: that.userInfo.loginAccount,
- }, false)
- .then(function (res) {
- that.$notify({ type: 'success', message: '淇敼鎴愬姛' });
- that.refreshResult();
- })
- .catch(function (error) {
- that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
- console.log(error);
- });
- },
- eidt() {
-
- if (!this.editData.fcheckResu) {
- this.$toast.fail("璇疯緭鍏ユ楠岀粨鏋�");
- }
-
- if (this.formData.fcheckResu == this.editData.fcheckResu) {
- this.$notify({ type: 'success', message: '淇敼鎴愬姛' });
- return;
- }
-
- let fstand = "鈭�";
-
- if (this.formData.fupAllow && this.formData.fdownAllow) {
-
- if (!this.editData.fcheckResu) {
- this.$toast.fail("璇疯緭鍏ユ楠屽��");
- return;
- }
-
- let max = Number(this.formData.fupAllow);
- let min = Number(this.formData.fdownAllow);
-
- if (this.editData.fcheckResu >= min && this.editData.fcheckResu <= max) {
- this.editData.isPass = 1
- } else {
- this.editData.isPass = 0
- fstand = "脳";
- }
-
- } else {
-
- if (!this.editData.fcheckResu) {
- this.editData.fcheckResu = 1
- }
-
- if (this.editData.fcheckResu == 0 || this.editData.fcheckResu == 1) {
- if (this.editData.fcheckResu == 0) {
- fstand = "脳";
- }
- } else {
- this.$toast.fail("鏃犳爣鍑嗗�兼椂锛屾楠岀粨鏋滃彧鑳戒负0鎴�1!");
- return;
- }
- }
-
- this.editData.updater = this.userInfo.loginAccount;
-
- var that = this;
-
- that.AxiosHttp("post", 'LLJ/UpdateQSItemDetail', {
- guid: that.editData.guid,
- parentGuid: that.editData.parentGuid,
- grandpaGuid: that.editData.grandpaGuid,
- fstand: fstand,
- fcheckResu: that.editData.fcheckResu,
- lastupdateBy: that.userInfo.loginAccount,
- }, false)
- .then(function (res) {
-
- if (res.status == 0) {
- that.$notify({ type: 'success', message: '淇敼鎴愬姛' });
- that.showPopup = false;
- that.refreshResult();
- } else {
- that.$toast.fail(res.message);
- that.editData.fcheckResu = that.fcheckResu;
- }
- })
- .catch(function (error) {
- that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
- console.log(error);
- });
- },
- GoBack1() {
- window.history.back();
- }
- }
-})
\ No newline at end of file
--
Gitblit v1.9.3