工控报工修改

cnf

6 天以前 69efa794fed691aeb990325aa9ed2309f6ff8c10

工控报工修改

 BaoGong/Scripts/config.js

@@ -1,6 +1,5 @@
var APIURL = "http://192.168.1.187:81/";
/*var APIURL = "http://localhost:5263/";*/
//http://192.168.1.145:81/swagger/index.html
//var APIURL = "http://localhost:5263/";
String.prototype.trim = function () {
    return this.replace(/(^\s*)|(\s*$)/g, "");
}

 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,6 +35,16 @@
      .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">
@@ -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>
                        <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分ss秒"
                              @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,16 +193,15 @@
      :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>

 BaoGong/fjLogin.aspx

@@ -1,7 +1,8 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeFile="fjLogin.aspx.cs" Inherits="BaoGong_fjLogin" %>
<html>
<head>
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
    <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0;" name="viewport" />
    <link rel="icon" href="/BaoGong/images/favicon.png" type="image/png">
    <title><%= System.Configuration.ConfigurationManager.AppSettings["webTitle"].ToString() %></title>
    <link href="/BaoGong/images/fj.css?<%=123321%>" rel="stylesheet" />
@@ -15,7 +16,7 @@
     }
 </style>
</head>
<body>
<body >
    <div id="app" class="text-center" v-cloak>
        <div class="padding-lg" style="max-width:7.5rem;margin:auto">
             <div class="font-lg padding-lg margin"><%= System.Configuration.ConfigurationManager.AppSettings["webTitle"].ToString() %></div>

 BaoGong/js/fjByPrd.js

@@ -7,40 +7,37 @@
            showBgr: false,//报工人
            showAction: false,//右上角
            modelDaaJson: [],
            modelYgJson:[],
            modelYgJson: [],
            modelJson: [],
            actions: [{ name: '开工' }, { name: '暂停' }, { name: '提交首检' }, { name: '提交入库检' }],
            actions: [{ name: '刷新' }, { name: '开工' }, { name: '暂停' }, { name: '提交首检' }, { name: '提交入库检' }],
            erd: null,
            tableHeight: 1,
            searchHeight: 1,
            fjInfor: {
                guid:"",
                gdbh: "PPBOM00015331-1",
                bgUserNo: "刘秀丽",
                "gdzs": "500",
                "yscs": "20",
                "yrks": "20",
                "kdysl": "480",//可打印数量
                "gdzt": "生产中",
                "prdName": "塑件-XQJ-001-水箱",
                "prdNo": "011616000382",
                "prdModel": "模内注塑 鸿效电脑板专用",
                "qt": "齐套",
                "yjkg": "2025-09-27 16:36:28.003",
                "yjwg": "2025-09-27 16:36:28.003",
                "xsdd": "salw123",
                "ydsl": "20",//已打数量
                "sj": "合格",
                "xj": "合格",
                "sysl": "400",
                "dyzs": "0", //打印张数
                list: [
                      { bg: 1, rk: 1, tbm: 'TB25111827361', nbzsl: 48, dw: '个', itemNo: "060101030301", itemName: '印刷品-功率贴-New General', bgr: '刘秀丽', bgrDate: '2025-11-26 13:24:25' }
                    , { bg: 0, rk: 0, tbm: 'TB25111827361', nbzsl: 48, dw: '个', itemNo: "060101030301", itemName: '印刷品-功率贴-New General', bgr: '刘秀丽', bgrDate: '2025-11-26 13:24:25' }
                    , { bg: 1, rk: 1, tbm: 'TB25111827361', nbzsl: 48, dw: '个', itemNo: "060101030301", itemName: '印刷品-功率贴-New General', bgr: '刘秀丽', bgrDate: '2025-11-26 13:24:25' }
                    , { bg: 0, rk: 0, tbm: 'TB25111827361', nbzsl: 48, dw: '个', itemNo: "060101030301", itemName: '印刷品-功率贴-New General', bgr: '刘秀丽', bgrDate: '2025-11-26 13:24:25' }
                ]
                guid: "",
                gdbh: "",
                bgUserNo: "",
                "gdzs": "",
                "yscs": "",
                "yrks": "",
                "kdysl": "",//可打印数量
                "gdzt": "",
                "prdName": "",
                "prdNo": "",
                "prdModel": "",
                "qt": "",
                "yjkg": "",
                "yjwg": "",
                "xsdd": "",
                "ydsl": "",//已打数量
                "sj": "",
                "xj": "",
                "dyzs": "", //打印张数
                "yssj": 0,
                "bzsl": 1,//包装数量
                list: []
            },
            isButtonDisabled: true,
        }
    },
    computed: {
@@ -61,10 +58,26 @@
        })
    },
    methods: {
        //切换登录账号
        onClickLogin() {
            var that = this;
            that.$dialog.confirm({
                title: '友情提醒',
                message: '确定切换账号吗？',
            })
                .then(() => {
                    window.location.href = ("/BaoGong/fjLogin.aspx?math=" + Math.random() + "&cjId=" + that.Request("cjId"));
                })
                .catch(() => {
                    // on cancel
                });
        },
        //返回
        onClickLeft() {
            var that = this;
            window.location.href = ("/BaoGong/fjDefault.aspx?cjId=" + that.Request("cjId"));
        },
        //读取工单列表
        getDaaList() {
            var that = this;
            that.showDaa = true;
@@ -81,12 +94,13 @@
                        that.modelDaaJson = res.rtnData;
                    }
                    else {
                        that.$message.error(json.rtnMsg);
                        that.$toast.fail(json.rtnMsg);
                    }
                })
                .catch(function (error) {
                });
        },
        //读取员工列表
        getYgList() {
            var that = this;
            that.showBgr = true;
@@ -104,12 +118,13 @@
                        that.modelYgJson = res.rtnData;
                    }
                    else {
                        that.$message.error(json.rtnMsg);
                        that.$toast.fail(json.rtnMsg);
                    }
                })
                .catch(function (error) {
                });
        },
        //读取工单信息
        getDaa(daaGuid) {
            var that = this;
            that.isLoading = true;
@@ -124,18 +139,195 @@
                        that.isLoading = false;
                        that.fjInfor = res.rtnData;
                        that.showDaa = false;
                        that.djsReset();
                    }
                    else {
                        that.$message.error(json.rtnMsg);
                        that.$toast.fail(json.rtnMsg);
                    }
                })
                .catch(function (error) {
                });
        },
        //读取报工人列表
        getBgr(item) {
            var that = this;
            that.fjInfor.bgUserNo = item.ygName;
            that.showBgr = false;
        },
        //选择工单操作行为
        onSelect(item) {
            var that = this;
            var actName = item.name;
            that.$dialog.confirm({
                title: '友情提醒',
                message: '当前工单号是【' + that.fjInfor.gdbh + '】确定' + actName + '吗？',
            })
                .then(() => {
                    that.onSelectSubmit(actName);
                })
                .catch(() => {
                    // on cancel
                });

        },
        //工单操作提交
        onSelectSubmit(actName) {
            var that = this;
            var _daaGuid = that.fjInfor.guid;
            if (_daaGuid.length <= 0) {
                that.$toast.fail("请选择工单");
                return;
            }
            var _inFieldValue = "";
            var model = {
                guid: "",
                inFieldValue: "",
            }
            var _apiUrl = ('');
            switch (actName) {
                case '刷新':
                    that.getDaa(_daaGuid);
                    return;
                    break;
                case '开工':
                    _inFieldValue = 8;
                    var model = {
                        guid: _daaGuid,
                        inFieldValue: _inFieldValue,
                    }
                    var _apiUrl = ('WomdaaManager/EditModelSubmit');
                    break;
                case '暂停':
                    _inFieldValue = 2;
                    var model = {
                        guid: _daaGuid,
                        inFieldValue: _inFieldValue,
                    }
                    var _apiUrl = ('WomdaaManager/EditModelSubmit');
                    break;
                case '提交首检':
                    _inFieldValue = 98;
                    var model = {
                        guid: _daaGuid,
                        inFieldValue: "",
                    }
                    var _apiUrl = ('WomdaaManager/EditModelSubmitShouJian');
                    break;
                case '提交入库检':
                    alert("不知道入库检接口");
                    //_inFieldValue = 99;
                    //var model = {
                    //    guid: _daaGuid,
                    //    inFieldValue: "",
                    //}
                    //var _apiUrl = ('WomdaaManager/EditModelSubmitShouJian');
                    break;
            };
            that.isLoading = true;
            that.AxiosHttp("post", _apiUrl, model)
                .then(function (res) {
                    var json = res;
                    if (json.rtnCode * 1 > 0) {
                        that.isLoading = false;
                        that.$dialog.alert({
                            title: '友情提示',
                            message: json.rtnData.outMsg,
                        }).then(() => {
                            that.getDaa(_daaGuid);
                        });
                    }
                    else {
                        that.$toast.fail(json.rtnMsg);
                    }
                })
                .catch(function (error) {
                });
        },
        //倒计时开始
        djsReset() {
            this.isButtonDisabled = true;
            this.$refs.countDown.reset();
        },
        //倒计时结束
        djsFinish() {
            this.isButtonDisabled = false;
        },
        //打码报工
        onBaoGongSubmit() {
            var that = this;
            var _daaGuid = that.fjInfor.guid;
            if (_daaGuid.length <= 0) {
                that.$toast.fail("请选择工单");
                return;
            }
            var _bzsl = that.fjInfor.bzsl * 1;
            if (_bzsl * 1 <= 0) {
                that.$toast.fail("请确定包装数量");
                return;
            }
            var _dyzs = that.fjInfor.dyzs * 1;
            if (_dyzs * 1 <= 0) {
                that.$toast.fail("请确定打印张数");
                return;
            }
            var model = {
                inDaaGuid: _daaGuid,
                bzsl: _bzsl,
            }
            var _apiUrl = ('BaoGong/DaaDmbg');
            that.isLoading = true;
            that.$dialog.confirm({
                title: '友情提醒',
                message: '当前工单号是【' + that.fjInfor.gdbh + '】确定打码报工吗？',
            })
                .then(() => {
                    /////////////////////////////////////////
                    that.AxiosHttp("post", _apiUrl, model)
                        .then(function (res) {
                            var json = res;
                            if (json.rtnData.barcodeGuid.length > 0) {
                                that.isLoading = false;
                                that.$dialog.alert({
                                    title: '友情提示',
                                    message: json.rtnData.outMsg,
                                }).then(() => {
                                    var tbm = json.rtnData.barcode;//条码
                                    var barcodeGuid = json.rtnData.barcodeGuid; //条码guid
                                    that.print2({ guid: barcodeGuid, tbm: tbm },0)
                                    that.getDaa(_daaGuid);
                                });
                            }
                            else {
                                that.$toast.fail(json.rtnData.outMsg);
                            }
                        })
                        .catch(function (error) {
                        });
                    //////////////////////////////////////////
                })
                .catch(() => {
                    // on cancel
                });
        },
        print2(obj,isDia) {
            var that = this;
            var barcodeGuid = obj.guid;//条码明细guid
            var tbm = obj.tbm;//条码
            if (isDia * 1 == 1) {
                that.$dialog.confirm({
                    title: '友情提醒',
                    message: '你选择了拖板码【' + tbm + '】确定重新打印吗？',
                })
                    .then(() => {
                        googleBrower.printLabel(that.fjInfor.guid, barcodeGuid);
                    })
                    .catch(() => {
                        // on cancel
                        return;
                    });
                return;
            }
            googleBrower.printLabel(that.fjInfor.guid, barcodeGuid);
        }
    },
})

 BaoGong/js/fjDefault.js

@@ -43,7 +43,7 @@
                        that.modelCjName = res.rtnMsg;
                    }
                    else {
                        that.$message.error(json.rtnMsg);
                        that.$toast.fail(json.rtnMsg);
                    }
                })
                .catch(function (error) {

 BaoGong/js/fjLogin.js

@@ -4,8 +4,8 @@
        return {
            isLoading: false,
            formCustom: {
                phone: 'admin',
                passwd: 'gs666',
                phone: '0301',
                passwd: '123456',
            },
            showPassword: false,
            showPhone: false,