cnf
6 天以前 32274bc8fad5251f78229d67d86c234a4b32df2e
销售与其他出入库功能挪移
已修改7个文件
325 ■■■■ 文件已修改
H5/Js/Qtck.js 104 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/Qtrk.js 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/Xsck.js 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Qtck.aspx 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Qtrk.aspx 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Xsck.aspx 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Xsth.aspx 65 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/Qtck.js
@@ -18,6 +18,8 @@
            show: false,
            actions: [],
            ItemDetail: [],
            splitNum: "",
            zdy: "",
        }
    },
    mounted() {
@@ -87,7 +89,10 @@
                    var json = res;
                    if (json.status == 0) {
                        that.ItemDetail = json.data.tbBillList;
                        that.zdy = json.data.tbBillList.allList[0].createNmae;
                        //that.ItemBlDetail = json.data.tbBillList;
                        that.$refs.barcode.focus();
                        that.barcode = "";
                    }
                    else {
                        that.$toast.fail(json.message);
@@ -140,18 +145,23 @@
                .then(function (res) {
                    var json = res;
                    if (json.status == 0) {
                        that.itemNo = json.data.form.itemNo;
                        that.num = json.data.form.num;
                        that.fnm = json.data.form.fum;
                        that.barcode = json.data.form.barcode;
                        that.ItemBlDetail = json.data.item
                        that.$notify({ type: 'success', message: json.data.message });
                        that.num = json.data.tbBillList.barcodeNum;
                        that.GetMesItemBlDetailByBillNo();
                        that.$refs.barcode.focus();
                        that.barcode = null;
                        that.$playSound('success');
                        that.$notify({ type: 'success', message: json.message });
                    }
                    else if (json.status == 2) {
                        that.$refs.splitNum.focus();
                        that.splitNum = json.data.tbBillList.splitNum;
                        that.num = json.data.tbBillList.barcodeNum;
                    }
                    else {
                        that.$toast.fail(json.message);
                        that.$playSound('error');
                        that.$toast.fail(json.message);
                        that.$refs.barcode.focus();
                        that.barcode = null;
                    }
                    that.isLoading = false;
                })
@@ -234,6 +244,82 @@
                    that.$playSound('error');
                    console.log(error);
                });
        }
        },
        getChaiFen() {
            //this.isPrinterPopupVisible = true; // 显示弹窗
            if (this.isLoading) {
                return;
            }
            var that = this;
            if (!that.userInfo.loginAccount) {
                this.$toast.fail("请重新检查登录状态");
                that.$playSound('error');
                that.isLoading = false;
                return;
            }
            if (!that.barcode) {
                this.$toast.fail("条码不能为空");
                that.$playSound('error');
                that.isLoading = false;
                return;
            }
            if (!that.billNo) {
                this.$toast.fail("申请单号不能为空");
                that.$playSound('error');
                that.isLoading = false;
                return;
            }
            //that.ip = "";
            //that.prot = "";
            //that.getPrintInfo();
            //if (that.ip.length <= 0 || that.prot.length <= 0) {
            //    alert(that.ip);
            //    alert(that.prot);
            //    return;
            //}
            that.isLoading = true;
            that.AxiosHttp("post", 'MesItemQt/ScanCodeCF', {
                userName: that.userInfo.loginAccount,
                barcode: that.barcode,
                billNo: that.billNo,
                Num: that.splitNum,
            }, false)
                .then(function (res) {
                    var json = res;
                    if (json.status == 0) {
                        //  that.modeInfo = json.data.tbBillList;
                        that.splitNum = null;
                        that.num = null;
                        that.barcode = null;
                        that.$notify({ type: 'success', message: json.message });
                        that.$playSound('success');
                        that.GetMesItemBlDetailByBillNo();
                        //that.sendMessage(json.data.tbBillList);
                        that.sendPrintMessage(json.data.tbBillList);
                        that.$refs.barcode.focus();
                    }
                    else {
                        that.$playSound('error');
                        that.$toast.fail(json.message);
                    }
                    that.isLoading = false;
                })
                .catch(function (error) {
                    that.isLoading = false;
                    that.$toast.fail("网络错误,请重试!");
                    that.$playSound('error');
                });
        },
    }
})
H5/Js/Qtrk.js
@@ -18,6 +18,7 @@
            show: false,
            actions: [],
            ItemDetail: [],
            depotInfo:[],
        }
    },
    mounted() {
@@ -61,11 +62,6 @@
                    that.$playSound('error');
                    console.log(error);
                });
        },
        onClick(index, title) {
            this.$toast(`${index} ${title}`);
            this.$notify({ type: 'success', message: '某某物料扫码成功某某物料扫码成功某某物料扫码成功某某物料扫码成功' });
        },
        onSelect(item) {
            // 默认情况下点击选项时不会自动收起
@@ -139,6 +135,7 @@
                    if (json.status == 0) {
                        //that.$notify({ type: 'success', message: json.data.tbBillList });
                        //that.$playSound('success');
                        that.depotInfo = json.data;
                        that.$refs.barcode.focus();
                    }
                    else {
H5/Js/Xsck.js
@@ -29,8 +29,8 @@
        };
    },
    methods: {
        //获取发货通知单号
        getInfo() {
            this.show = true;
            var that = this;
            that.isLoading = true
@@ -47,11 +47,11 @@
                            that.actions = json.data.tbBillList.map(item => {
                                return { name: item }
                            });
                        }
                    }
                    else {
                        that.$toast.fail(json.message);
                        that.show = false;
                    }
                    that.isLoading = false;
                })
@@ -67,6 +67,7 @@
        //    this.$notify({ type: 'success', message: '某某物料扫码成功某某物料扫码成功某某物料扫码成功某某物料扫码成功' });
        //},
        //点击事件
        onSelect(item) {
            // 默认情况下点击选项时不会自动收起
            // 可以通过 close-on-click-action 属性开启自动收起
@@ -77,6 +78,7 @@
            //this.$toast(item.name);
        },
        //根据发货通知单号获取明细
        GetMesItemDetailByBillNo() {
            var that = this;
            that.isLoading = true;
@@ -110,6 +112,7 @@
                    that.ItemBlDetail = [];
                });
        },
        //扫码
        getBarcode() {
            //this.barcode = value;
@@ -155,7 +158,6 @@
                        that.barcode = null;
                        that.sms = null;
                        that.num = null;
                        //that.ItemBlDetail = json.data.tbBillList.item2
                        that.$notify({ type: 'success', message: '扫描成功' });
                        that.GetMesItemDetailByBillNo();
                        that.$refs.barcode.focus();
@@ -188,6 +190,7 @@
                    that.splitNum = "";
                });
        },
        //条码拆分
        tmcf() {
            //this.show = true;
H5/Qtck.aspx
@@ -8,6 +8,12 @@
        </style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
            <van-notice-bar
    :scrollable="false"
    :text="'当前组织:' + (Cookies.get('orgName') || '暂无组织信息')"
    class="org-info"
/></van-notice-bar>
        <van-nav-bar
          title="其他出库"
          left-text="返回"
@@ -29,6 +35,7 @@
    <van-button size="small" type="info" plain @click="getInfo" >选择</van-button>
  </template></van-field>
 <van-field
     ref="barcode"
  value=""
  label="物料条码"
   clearable 
@@ -41,12 +48,13 @@
></van-field>
 <van-field
  value=""
  label="物料编码"
  label="制单人"
   clearable 
 placeholder="物料编码"
 placeholder="制单人"
  :right-icon-size="19"
     v-model="itemNo"
     v-model="zdy"
  v-focus.noKeyboard
     disabled
></van-field>
   <van-field
  value=""
@@ -55,15 +63,22 @@
  placeholder="条码数量"
  disabled
></van-field>
<van-field
  value=""
       v-model="fnm"
  label="发料数量"
  placeholder="发料数量"
  disabled
><template #button>
    <van-button size="small" type="info" plain @click="tmcf" >条码拆分</van-button>
  </template></van-field>
            <van-field
    ref="splitNum"
    v-model="splitNum"
    center
    clearable
    label="发料数量"
    placeholder="发料数量">
    <van-button
        slot="button"
        type="info"
        size="small"
        plain
        @click="getChaiFen">
        条码拆分
    </van-button>
</van-field>
</van-cell-group>
    </div>
@@ -129,5 +144,5 @@
  <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="Js/Qtck.js?<%=11300 %>"></script>
 <script src="Js/Qtck.js?<%=11306 %>"></script>
</asp:Content>
H5/Qtrk.aspx
@@ -8,6 +8,12 @@
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
                <van-notice-bar
    :scrollable="false"
    :text="'当前组织:' + (Cookies.get('orgName') || '暂无组织信息')"
    class="org-info"
/></van-notice-bar>
        <van-nav-bar
          title="其他入库"
          left-text="返回"
@@ -38,6 +44,26 @@
      <%--@change="getSectionCode"--%>
   :right-icon-size="19"
   placeholder="库位编码"
></van-field>
 <van-field
        ref="depotsInfo"
        v-model="depotInfo.depot_code"
    value=""
    label="仓库编码"
    clearable
    placeholder="仓库编码"
    :right-icon-size="19"
        disabled
></van-field>
                <van-field
        ref="depotsInfo"
        v-model="depotInfo.depot_name"
    value=""
    label="仓库名称"
    clearable
    placeholder="仓库名称"
    :right-icon-size="19"
        disabled
></van-field>
 <van-field
     ref="barcode"
@@ -132,5 +158,5 @@
  <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="Js/Qtrk.js?<%=124000 %>"></script>
 <script src="Js/Qtrk.js?<%=1240002 %>"></script>
</asp:Content>
H5/Xsck.aspx
@@ -8,6 +8,12 @@
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
        <van-notice-bar
    :scrollable="false"
    :text="'当前组织:' + (Cookies.get('orgName') || '暂无组织信息')"
    class="org-info"
/></van-notice-bar>
        <van-nav-bar
          title="销售出库"
          left-text="返回"
@@ -62,30 +68,49 @@
</van-cell-group>
    </div>
    <div  class="van-tab-left">
              <van-tabs <%--@click="onClick"--%> color="#000" title-active-color="#0283EF" >
  <van-tab title="待发物料" class="mySolid font">
<%--    <van-row v-for="value in ItemBlDetail" class="font">
          <van-col span="12">物料:{{value.itemNo}}</van-col>
          <van-col span="6">申请数{{value.bld007}}</van-col>
          <van-col span="6">已领数{{value.bld008}}</van-col>
    </van-row>--%>
<van-tabs color="#000" title-active-color="#0283EF">
    <van-tab title="待扫物料" class="mySolid font">
        <van-row>
        <van-col span="12" class="text-left padding-left">物料</van-col>
         <van-col span="6">需领</van-col>
        <van-col span="6">已扫</van-col>
</van-row>
<van-row  v-for="value in ItemBlDetail" class="font">
      <van-col span="12"  class="text-left padding-left">
           <div>{{value.itemNo}}</div>
           <div>{{value.itemName}}</div>
      </van-col>
      <van-col span="6">{{value.fQty}}</van-col>
     <van-col span="6">{{value.sQty || 0}}</van-col>
</van-row>
  </van-tab>
            <van-col span="8" class="text-left padding-left">物料</van-col>
            <van-col span="8" class="text-left padding-left">规格</van-col>
            <van-col span="3">待扫</van-col>
            <van-col span="5">推荐库位</van-col>
        </van-row>
        <van-row v-for="(itm,index) in ItemBlDetail.items" :key="index">
            <van-col span="8" class="text-left padding-left">
                <div class="blue-text">{{itm.itemNo}}</div>
                <div>{{itm.itemName}}</div>
            </van-col>
            <van-col span="8" class="text-left padding-left">
                <div>{{itm.itemModel}}</div>
            </van-col>
            <van-col span="3" class="blue-text">{{itm.dsQty}}</van-col>
            <van-col span="5">{{itm.recoKw}}</van-col>
        </van-row>
    </van-tab>
    <van-tab title="已扫物料" class="mySolid font">
        <van-row>
            <van-col span="8" class="text-left padding-left">物料</van-col>
            <van-col span="8" class="text-left padding-left">规格</van-col>
            <van-col span="3">需领数</van-col>
            <van-col span="5">已领数</van-col>
        </van-row>
        <van-row v-for="(itm,index) in ItemBlDetail.ysitems" :key="index">
            <van-col span="8" class="text-left padding-left">
                <div class="blue-text">{{itm.itemNo}}</div>
                <div>{{itm.itemName}}</div>
            </van-col>
            <van-col span="8" class="text-left padding-left">
                <div>{{itm.itemModel}}</div>
            </van-col>
            <van-col span="3">{{itm.fQty}}</van-col>
            <van-col span="5" class="blue-text">{{itm.sQty}}</van-col>
        </van-row>
    </van-tab>
</van-tabs>
    </div>
    <van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
@@ -95,5 +120,5 @@
  <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="Js/Xsck.js?<%=1271111 %>"></script>
 <script src="Js/Xsck.js?<%=1271113 %>"></script>
</asp:Content>
H5/Xsth.aspx
@@ -8,6 +8,12 @@
        </style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
            <van-notice-bar
    :scrollable="false"
    :text="'当前组织:' + (Cookies.get('orgName') || '暂无组织信息')"
    class="org-info"
/></van-notice-bar>
        <van-nav-bar
          title="销售退货"
          left-text="返回"
@@ -68,24 +74,47 @@
</van-cell-group>
    </div>
      <van-tabs <%--@click="onClick"--%> color="#000" title-active-color="#0283EF" >
              <van-tab title="待退明细" class="mySolid font">
  <van-row>
        <van-col span="12" class="text-left padding-left">物料</van-col>
         <van-col span="6">待扫</van-col>
        <van-col span="6">已扫</van-col>
</van-row>
  <van-row v-for="value in ItemTblDetail" class="font">
        <van-col span="12"  class="text-left padding-left">
              <div>{{value.itemNo}}</div>
              <div>{{value.itemName}}</div>
          </van-col>
        <van-col span="6">{{value.fQty}}</van-col>
        <van-col span="6">{{value.sQty || 0}}</van-col>
  </van-row>
</van-tab>
          <van-tab title="已退明细"></van-tab>
<van-tabs color="#000" title-active-color="#0283EF">
    <van-tab title="待扫物料" class="mySolid font">
        <van-row>
            <van-col span="8" class="text-left padding-left">物料</van-col>
            <van-col span="8" class="text-left padding-left">规格</van-col>
            <van-col span="3">待扫</van-col>
            <van-col span="5">推荐库位</van-col>
        </van-row>
        <van-row v-for="(itm,index) in ItemTblDetail.items" :key="index">
            <van-col span="8" class="text-left padding-left">
                <div class="blue-text">{{itm.itemNo}}</div>
                <div>{{itm.itemName}}</div>
            </van-col>
            <van-col span="8" class="text-left padding-left">
                <div>{{itm.itemModel}}</div>
            </van-col>
            <van-col span="3" class="blue-text">{{itm.dsQty}}</van-col>
            <van-col span="5">{{itm.recoKw}}</van-col>
        </van-row>
    </van-tab>
    <van-tab title="已扫物料" class="mySolid font">
        <van-row>
            <van-col span="8" class="text-left padding-left">物料</van-col>
            <van-col span="8" class="text-left padding-left">规格</van-col>
            <van-col span="3">需领数</van-col>
            <van-col span="5">已领数</van-col>
        </van-row>
        <van-row v-for="(itm,index) in ItemTblDetail.ysitems" :key="index">
            <van-col span="8" class="text-left padding-left">
                <div class="blue-text">{{itm.itemNo}}</div>
                <div>{{itm.itemName}}</div>
            </van-col>
            <van-col span="8" class="text-left padding-left">
                <div>{{itm.itemModel}}</div>
            </van-col>
            <van-col span="3">{{itm.fQty}}</van-col>
            <van-col span="5" class="blue-text">{{itm.sQty}}</van-col>
        </van-row>
    </van-tab>
</van-tabs>
    <van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
@@ -96,6 +125,6 @@
    <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="Js/Xsth.js?<%=161 %>"></script>
 <script src="Js/Xsth.js?<%=162 %>"></script>
</asp:Content>