1.生产补料/超领优化 2.委外补料/超领优化 3.巡检检验新增工单查询选择 4.巡检优化新增时间段字段

南骏 池

2025-06-09 03ff743705dd64f67e6e4aabd03ec5591b922ff9

1.生产补料/超领优化
2.委外补料/超领优化
3.巡检检验新增工单查询选择
4.巡检优化新增时间段字段

 H5/IPQC_SJ/Add.aspx

@@ -185,7 +185,7 @@
<%--                    <van-tag round plain v-else-if="formData.fCheckResu === '未检验'" type="warning">未检验</van-tag>--%>
                    <van-tag round plain v-else-if="formData.fCheckResu === 'I:进行中'" type="warning">进行中</van-tag>
                    <van-tag round plain v-else-if="formData.fCheckResu === 'Y:合格'" type="success">合格</van-tag>
                    <van-tag round plain v-else type="danger">异常状态</van-tag>
                    <van-tag round plain v-else type="danger">未知</van-tag>
<%--                  <van-tag  round plain
                    :type="formData.fCheckResu === '不合格' ? 'danger' : 
                          formData.fCheckResu === '检验中' ? 'warning' :

 H5/IPQC_SJ/List.aspx

@@ -78,7 +78,7 @@
                                      <van-tag round plain v-else-if="item.fCheckResu === 'W:未知'" 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 === 'Y:合格'" type="success">合格</van-tag>
                                      <van-tag round plain v-else type="danger">异常状态</van-tag>
                                      <van-tag round plain v-else type="danger">未知</van-tag>
                                  </template>
                               </van-field>
                             </van-cell-group>

 H5/IPQC_XJ/Add.aspx

@@ -54,7 +54,7 @@
<%--                    <van-tag round plain v-else-if="formData.fCheckResu === '未检验'" type="warning">未检验</van-tag>--%>
                    <van-tag round plain v-else-if="formData.fCheckResu === 'I:进行中'" type="warning">进行中</van-tag>
                    <van-tag round plain v-else-if="formData.fCheckResu === 'Y:合格'" type="success">合格</van-tag>
                    <van-tag round plain v-else type="danger">异常状态</van-tag>
                    <van-tag round plain v-else type="danger">未知</van-tag>
<%--                  <van-tag  round plain
                    :type="formData.fCheckResu === '不合格' ? 'danger' : 
                          formData.fCheckResu === '检验中' ? 'warning' :
@@ -80,7 +80,21 @@
                  </div>
                </template>
              </van-field>--%>
                <van-field
                    ref ="selectKey"
                value=""
                label="工单查询"
                clearable 
                    placeholder="请输入工单号进行查询"
                :right-icon-size="19"
                    v-model="selectKey"
                ><template #button>
                <van-button size="small" type="info" plain @click="getInfo" >选择</van-button>
                </template></van-field>
                            <van-action-sheet v-model="daashow" :actions="actions" @select="onSelect" ></van-action-sheet>

              <van-field label="指令工单" colon="true" v-model="formData.lotNo" @keyup.enter.native="createByWomdaa" ></van-field>
              <van-field label="检验时段" colon="true" v-model="formData.checkTimeSlot" readonly ></van-field>
<%--              <van-field label="创建时间" colon="true" v-model="formData.createDate" readonly ></van-field>
              <van-field label="创建人" colon="true" v-model="formData.createBy" readonly ></van-field>--%>
              <van-field label="物料编码" colon="true" v-model="formData.itemNo" readonly ></van-field>
@@ -337,5 +351,5 @@
  <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="../Js/IPQC_XJ/Add.js?<%=11111111 %>"></script>
 <script src="../Js/IPQC_XJ/Add.js?<%=11111111111 %>"></script>
</asp:Content>

 H5/IPQC_XJ/List.aspx

@@ -51,7 +51,8 @@
                          <div>
                             <van-cell-group>
                               <van-cell :title="item.releaseNo" is-link :url="'Add.aspx?id='+item.guid+'&lotNo='+item.lotNo+'&releaseNo='+item.releaseNo" ></van-cell>
                               <van-field label="指令工单" colon="true" v-model="item.lotNo" readonly ></van-field>
                               <van-field label="检验时段" colon="true" v-model="item.checkTimeSlot" readonly ></van-field>
                                 <van-field label="指令工单" colon="true" v-model="item.lotNo" readonly ></van-field>
                                 <!-- 自定义字段用于显示两个标识 -->
<%--                                <van-field label="标识" colon="true" readonly >
                                  <template #input>
@@ -78,7 +79,7 @@
                                      <van-tag round plain v-else-if="item.fCheckResu === 'W:未知'" 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 === 'Y:合格'" type="success">合格</van-tag>
                                      <van-tag round plain v-else type="danger">异常状态</van-tag>
                                      <van-tag round plain v-else type="danger">未知</van-tag>
                                  </template>
                               </van-field>
                             </van-cell-group>

 H5/Js/IPQC_XJ/Add.js

@@ -40,6 +40,10 @@
            okValue: '',//OK-数量
            ngValue: '',//NG-数量
            showDialog: false,//不良表述输入框
            selectKey: "",//查询关键字
            actions: [],//列表的值
            daashow: false,//工单列表展示
            lineId:[],
            //图片上传框
            fileList: [

@@ -111,6 +115,70 @@
                console.log(error);
            });
        },

        getInfo() {
            this.daashow = true;
            var that = this;
            that.actions = [];
            that.isLoading = true;
            console.log(that.lineId);

            that.AxiosHttp("post", 'Ipqc/GetIpqcXjDaa', {
                selectKey: that.selectKey,
                xt: that.lineId,
            }, false)
                .then(function (res) {
                    var json = res;
                    if (json.status == 0) {

                        if (json.data.tbBillList.length <= 0) {
                            that.$toast.fail("没有可用的数据");
                            that.$playSound('error');
                        } else {
                            that.itemInfo = json.data.tbBillList;
                            that.actions = json.data.tbBillList.map(item => {
                                return {
                                    name: item.daaInfo  // 拼接字段

                                };
                            });
                        }
                    }
                    else {
                        that.$toast.fail(json.message);
                        that.$playSound('error');
                    }
                    that.isLoading = false;
                })
                .catch(function (error) {
                    that.isLoading = false;
                    that.$toast.fail("网络错误，请重试！");
                    that.$playSound('error');
                    console.log(error);
                });
        },

        onSelect(item) {
            // 默认情况下点击选项时不会自动收起
            // 可以通过 close-on-click-action 属性开启自动收起
            this.daashow = false;
            console.log(item);
            // 正则匹配第一个方括号内容
            const regex = /\[([^\]]+)\]/;
            const matchResult = item.name.match(regex);

            if (matchResult && matchResult[1]) {
                this.formData.lotNo = matchResult[1]; // PPBOM00000088-1
                console.log('提取的DAA001:', this.formData.lotNo);
            } else {
                this.$toast.fail('工单号格式异常');
                this.formData.lotNo = '';
            }
            this.createByWomdaa();
            //this.$toast(item.name);

        },

        getInputJYZ() {
            // 切换指定索引的 popup 状态
            var that = this;
@@ -167,8 +235,19 @@
                inOrderGuid1: guid1,
                userAccount: that.userInfo.loginAccount,
                DAA001: that.formData.lotNo
            }, false).then(res1 => {
            }, false).then(res => {
                var json = res;
                if (json.status == 0) {

                }
                else {
                    that.$toast.fail(json.message);
                    that.$playSound('error');
                    that.formData.lotNo = "";
                }
                that.isLoading = false;
                that.init();
                
            }).catch(error => {
                that.$toast.fail("网络错误，请重试！");
                console.error('Refresh error:', error);
@@ -205,6 +284,7 @@
                    if (data) {
                        that.formData = data;
                        that.remarks = that.formData.fnGDesc;
                        that.lineId = data.lineId;
                        that.AxiosHttp("post", 'LLJ/getJYItem', {
                            //id: that.formData.guid,
                            releaseNo: that.formData.releaseNo

 H5/Js/Scbl.js

@@ -78,7 +78,7 @@
        GetMesItemBlDetailByBillNo() {
            var that = this;
            that.isLoading = true;
            that.AxiosHttp("post", 'MesItemBl/GetMesItemBlDetailByBillNo', {
            that.AxiosHttp("post", 'MesItemBl/GetMesItemWWBlDetailByBillNo', {
                billNo: that.billNo,
                type: selectType
            }, false)

 H5/Js/Wwbl.js

@@ -78,7 +78,7 @@
        GetMesItemBlDetailByBillNo() {
            var that = this;
            that.isLoading = true;
            that.AxiosHttp("post", 'MesItemBl/GetMesItemBlDetailByBillNo', {
            that.AxiosHttp("post", 'MesItemBl/GetMesItemWWBlDetailByBillNo', {
                billNo: that.billNo,
                type: selectType,
            }, false)
@@ -87,7 +87,7 @@
                    if (json.status == 0) {
                        
                        that.ItemBlDetail = json.data.tbBillList.item2;
                        that.daa001 = json.data.tbBillList.item1;
                        that.daa001 = json.data.tbBillList.daa001;
                        that.$refs.barcode.focus();
                    }
                    else {

 H5/LLJ/Add.aspx

@@ -35,7 +35,7 @@
                    <van-tag round plain v-else-if="formData.fcheckResu === 'W:未知'" 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 === 'Y:合格'" type="success">合格</van-tag>
                    <van-tag round plain v-else type="danger">异常状态</van-tag>
                    <van-tag round plain v-else type="danger">未知</van-tag>
<%--                  <van-tag  round plain
                    :type="formData.fcheckResu === '不合格' ? 'danger' : 
                          formData.fcheckResu === '检验中' ? 'warning' :

 H5/LLJ/List.aspx

@@ -79,7 +79,7 @@
                                      <van-tag round plain v-else-if="item.fcheckResu === 'W:未知'" 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 === 'Y:合格'" type="warning">合格</van-tag>
                                      <van-tag round plain v-else type="danger">异常状态</van-tag>
                                      <van-tag round plain v-else type="danger">未知</van-tag>
                                  </template>
                               </van-field>
                             </van-cell-group>

 H5/Wwbl.aspx

@@ -97,5 +97,5 @@
  <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="Js/Wwbl.js?<%=144 %>"></script>
 <script src="Js/Wwbl.js?<%=1441 %>"></script>
</asp:Content>

 H5/Xctl.aspx

@@ -73,7 +73,7 @@
                    placeholder="请输入工单号进行查询"
                :right-icon-size="19"
                    v-model="selectKey"
                    @keyup.enter.native="GetMesItemBlDetailByBillNo"
<%--                    @keyup.enter.native="GetMesItemBlDetailByBillNo"--%>
                ><template #button>
                <van-button size="small" type="info" plain @click="getInfo" >选择</van-button>
                </template></van-field>

 Scripts/config.js

@@ -1,6 +1,7 @@
/*var APIURL = "http://192.168.1.145:83/api/";*/
var APIURL = "http://localhost:5204/api/";
var APIURL_PC = "http://192.168.1.145:81/";
/*var APIURL_PC = "http://192.168.1.145:81/";*/
var APIURL_PC = "http://192.168.1.145:8081/";//测试
var APIURL_IMAGE = APIURL_PC+"upload/";
var ISNEEDLOGIN = true;
String.prototype.trim = function () {