1.巡检成功提示优化 2.巡检检验状态bug优化 3.产品绑定“不合格数”bug优化 4.到货单送货条码标记

南骏 池

3 天以前 3876860f19d3f5693fd35b956e2a375ba1a0ada1

1.巡检成功提示优化
2.巡检检验状态bug优化
3.产品绑定“不合格数”bug优化
4.到货单送货条码标记

 H5/Cpbd.aspx

@@ -155,5 +155,5 @@
</asp:Content>

<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
    <script src="Js/Cpbd.js?<%=1211121 %>"></script>
    <script src="Js/Cpbd.js?<%=1211122 %>"></script>
</asp:Content>

 H5/Cpdbsj.aspx

@@ -144,12 +144,12 @@
                </van-field>
                
                <van-field
                    ref="xt"
                    v-model="xt"
                    ref="xtName"
                    v-model="xtName"
                    label="线别"
                    placeholder="请选择线别"
                    autofocus="true"
                    onclick="">
                    @click.native="selectXt">
                </van-field>
               <!-- 修改后的按钮容器 -->
                <div class="button-container">
@@ -181,7 +181,7 @@
                <van-row 
                    v-for="(itm,index) in XbarInfo" 
                    :key="index"
                    :style="{ background: itm.is_hedui === '1' ? '#e8f5e9 !important' : 'transparent' }">
                    :style="{ background: itm.is_hedui === '1' ? '#75f41d !important' : 'transparent' }">
                    <van-col span="7" class="text-left padding-left">{{itm.iteM_BARCODE}}</van-col>
                    <van-col span="7" class="text-left padding-left">
                        <div class="blue-text">{{itm.item_no}}</div>
@@ -223,5 +223,5 @@
</asp:Content>

<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
    <script src="Js/Cpbdsj.js?<%=1211111142 %>"></script>
    <script src="Js/Cpbdsj.js?<%=121111114211 %>"></script>
</asp:Content>

 H5/Dhdsh.aspx

@@ -130,8 +130,9 @@
                    <van-col span="5" >采购订单</van-col>
                </van-row>
                <van-row 
                    v-for="(itm,index) in BarList" 
                    :key="index">
                            v-for="(itm,index) in BarList" 
                            :key="index"
                            :style="{ background: itm.include_qty == itm.ysl ? '#75f41d !important' : 'transparent' }">
                    <van-col span="7" class="text-left padding-left">{{itm.small_barcode}}</van-col>
                    <van-col span="6" class="text-left padding-left">
                        <div class="blue-text">{{itm.item_no}}</div>

 H5/IPQC_XJ/Add.aspx

@@ -368,5 +368,5 @@
  <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="../Js/IPQC_XJ/Add.js?<%=111111111124 %>"></script>
 <script src="../Js/IPQC_XJ/Add.js?<%=1111111111254 %>"></script>
</asp:Content>

 H5/IPQC_XJ/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="success">合格</van-tag>
                                      <van-tag round plain v-else type="danger">未知</van-tag>
                                      <van-tag round plain v-else type="warning">未知</van-tag>
                                  </template>
                               </van-field>
                             </van-cell-group>

 H5/Js/Cpbd.js

@@ -28,7 +28,7 @@
            var that = this;
            that.isLoading = true;
            that.AxiosHttp("post", 'Womdaa/getZsBarInfo', {
                Xt: that.GX,
                GX: that.GX,
                Zsbarcode: that.ZsBar
            }, false)
                .then(function (res) {
@@ -40,6 +40,7 @@
                    }
                    else {
                        that.$toast.fail(json.message);
                        that.$playSound('error');
                        that.$refs.ZsBar.focus();
                        that.ZsBar = "";
                        that.ZsBarInfo = [];
@@ -50,6 +51,7 @@
                .catch(function (error) {
                    that.isLoading = false;
                    that.$toast.fail("网络错误，请重试！");
                    that.$playSound('error');
                    that.$refs.ZsBar.focus();
                    that.ZsBar = "";
                    that.ZsBarInfo = [];
@@ -60,10 +62,12 @@
            var that = this;
            if (that.ZsBar.length <= 0) {
                that.$toast.fail("追溯码不能为空！");
                that.$playSound('error');
                return;
            }
            if (that.LsBar.length <= 0) {
                that.$toast.fail("后盖码不能为空！");
                that.$playSound('error');
                return;
            }

@@ -78,12 +82,14 @@
                    if (json.status == 0) {
                        // that.scanInfo = json.data.tbBillList;
                        that.$notify({ type: 'success', message: json.message });
                        that.$playSound('success');
                        that.$refs.ZsBar.focus();
                        that.ZsBar = null;
                        that.LsBar = null;
                    }
                    else {
                        that.$toast.fail(json.message);
                        that.$playSound('error');
                        that.$refs.ZsBar.focus();
                        that.ZsBar = null;
                        that.LsBar = null;
@@ -94,6 +100,7 @@
                .catch(function (error) {
                    that.isLoading = false;
                    that.$toast.fail("网络错误，请重试！");
                    that.$playSound('error');
                    that.$refs.ZsBar.focus();
                    that.ZsBar = null;
                    that.LsBar = null;

 H5/Js/Cpbdsj.js

@@ -29,7 +29,8 @@
            DAA001: [],
            show: false,//列表展示
            actions: [],//列表的值
            xt:"",
            xtName: "",//线体名称
            xtNum: "",//线体编号
        }
    },
    mounted() {
@@ -349,17 +350,52 @@
        },

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

        },
        //获取可呼叫AGV的线体
        selectXt() {
            this.show = true;
            var that = this;
            that.actions = [];
            that.isLoading = true;
            that.AxiosHttp("post", 'Womdaa/GetAgvXt', {
                selectKey: that.selectKey,
            }, 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,  // 拼接字段
                                    subname:"[线体名称][]"

                                };
                            });
                        }
                    }
                    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);
                });
        },


    }

 H5/Js/IPQC_XJ/Add.js

@@ -220,6 +220,7 @@
        },

        addJyzIpqc(input) {

            var that = this;
            var guid1 = that.formData.guid;//主表id
            var mxguid = that.tableData[that.tabActive].guid;//检验项目的guid
@@ -230,8 +231,12 @@
                inP1: input,//或者0k-19,或者ng-19,或实际检验值
            }, true, 1).then(function (res1) {
                if (res1.rtnCode > 0) {
                    that.$notify({
                        type: 'success', message: res1.rtnMsg
                    //that.$notify({
                    //    type: 'success', message: res1.rtnMsg
                    //});
                    that.$toast.success({
                        duration: 1000, // 持续展示 toast
                        message: '操作成功',
                    });
                    that.refreshJYItem();//刷新检验项目
                    //that.handleTabClick();//刷新检验明细面板