调整 库位码 模板
条码生成时 添加 物料信息 可选 辅助属性
调拨申请单 明细信息 添加 调入组织
5个文件已修改
303 ■■■■■ 已修改文件
public/static/grf/库位码.grf 61 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basic/gyProperty/gyPropertyList.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/component/printList/hBarPlanPrint.vue 175 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue 55 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/static/grf/¿âλÂë.grf
@@ -1,5 +1,5 @@
{
    "Version":"6.8.2.2",
    "Version":"6.8.9.5",
    "Title":"1a.简单表格",
    "Author":"锐浪报表软件",
    "Description":"演示一个最基本的列表报表。",
@@ -22,11 +22,18 @@
        "CenterView":true,
        "PrintAdaptMethod":"ResizeToFit",
        "Recordset":{
            "ConnectionString":"xml",
            "QuerySQL":"销售出库单.txt",
            "Field":[
                {
                    "Name":"条码编号"
                    "Name":"条码编号1"
                },
                {
                    "Name":"条码编号2"
                },
                {
                    "Name":"仓位名称1"
                },
                {
                    "Name":"仓位名称2"
                }
            ]
        },
@@ -37,7 +44,7 @@
            }
        ],
        "ColumnContent":{
            "Height":3.41313,
            "Height":5.60917,
            "ColumnContentCell":[
                {
                    "Column":"单据号",
@@ -49,17 +56,49 @@
                            "Left":0.396875,
                            "Top":0.211667,
                            "Width":8.20208,
                            "Height":2.98979
                            "Height":5.18583
                        },
                        {
                            "Type":"Barcode",
                            "Name":"Barcode1",
                            "Left":0.211667,
                            "Top":0.396875,
                            "Width":4.39208,
                            "Height":2.59292,
                            "Left":-0.370417,
                            "Top":0.79375,
                            "Width":5.52979,
                            "Height":3.59833,
                            "BarcodeType":"QRCode",
                            "Text":"[#条码编号#]"
                            "CaptionPosition":"None",
                            "Text":"[#条码编号1#]"
                        },
                        {
                            "Type":"Barcode",
                            "Name":"Barcode2",
                            "Left":4.04813,
                            "Top":0.79375,
                            "Width":5.13292,
                            "Height":3.59833,
                            "BarcodeType":"QRCode",
                            "CaptionPosition":"None",
                            "Text":"[#条码编号2#]"
                        },
                        {
                            "Type":"FieldBox",
                            "Name":"FieldBox1",
                            "Left":0.608542,
                            "Top":4.60375,
                            "Width":3.59833,
                            "Height":0.608542,
                            "TextAlign":"MiddleCenter",
                            "DataField":"仓位名称1"
                        },
                        {
                            "Type":"FieldBox",
                            "Name":"FieldBox2",
                            "Left":4.78896,
                            "Top":4.60375,
                            "Width":3.59833,
                            "Height":0.608542,
                            "TextAlign":"MiddleCenter",
                            "DataField":"仓位名称2"
                        }
                    ]
                }
src/views/basic/gyProperty/gyPropertyList.vue
@@ -1159,10 +1159,10 @@
        this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
      }
      if (this.queryParams.HNumber) {
        this.sWhere += " and ä»“库代码 like '%" + this.queryParams.HNumber + "%'";
        this.sWhere += " and è¾…助属性代码 like '%" + this.queryParams.HNumber + "%'";
      }
      if (this.queryParams.HName) {
        this.sWhere += " and ä»“库名称 like '%" + this.queryParams.HName + "%'";
        this.sWhere += " and è¾…助属性名称 like '%" + this.queryParams.HName + "%'";
      }
      // if (this.queryParams.HOrgID) {
      //   this.sWhere += " and HUSEORGID = '" + this.queryParams.HOrgID + "'";
src/views/component/printList/hBarPlanPrint.vue
@@ -1,83 +1,106 @@
<template>
    <div>
        <div id="report_holder"> </div>
    </div>
  <div>
    <div id="report_holder"></div>
  </div>
</template>
<script>
import { webapp_ws_ajax_run, webapp_urlprotocol_startup, urlAddRandomNo } from "@/utils/grwebapp";
import axios from 'axios'
import {
  webapp_ws_ajax_run,
  webapp_urlprotocol_startup,
  urlAddRandomNo,
} from "@/utils/grwebapp";
import axios from "axios";
export default {
    name: 'HBarPlanPrint',
    data() {
        return {
            handleMessage: this.$route.query,
            baseURL: process.env.VUE_APP_BASE_API,
            //实际应用中,data应该为程序中通过各种途径获取到的数据,最后要将数据转换为报表需要的XML或JSON格式的字符串数据
            json_data: {
                recordset: []
            },
        }
  name: "HBarPlanPrint",
  data() {
    return {
      handleMessage: this.$route.query,
      baseURL: process.env.VUE_APP_BASE_API,
      //实际应用中,data应该为程序中通过各种途径获取到的数据,最后要将数据转换为报表需要的XML或JSON格式的字符串数据
      json_data: {
        recordset: [],
      },
    };
  },
  mounted() {
    this.ws_both_from_object();
  },
  // created() {
  //     this.ws_both_from_object()
  // },
  methods: {
    // èŽ·å–å‚æ•°_传递的JSON格式参数
    getUrlVars_JSON() {
      var datajson;
      var str = this.propsData; //获取链接中传递的参数
      var arr = str.substring(str.lastIndexOf("=") + 1);
      datajson = JSON.parse(decodeURI(arr));
      return datajson;
    },
    mounted() {
        this.ws_both_from_object()
    ws_both_from_object() {
      let OpenTmp = decodeURIComponent(this.$route.query.OpenTmp);
      let sql = "";
      if (this.$route.query.Type == "Kf_SellOutBillList") {
        sql =
          "exec h_p_Kf_SellOutBillList_PrintSellOutBill " +
          this.handleMessage.linterid.toString();
      } else if (this.$route.query.Type == "HGy_BarCodeBill") {
        sql =
          "select * from h_v_IF_BarCodeBillList where hmainid in(" +
          this.handleMessage.linterid.toString() +
          ") order by hmainid desc";
      } else if (this.$route.query.Type == "HPOInStockBill") {
        sql =
          "select * from h_v_Sc_PrintMouldProdOutBillList where hmainid=" +
          this.handleMessage.linterid.toString() +
          " order by hmainid";
      } else if (this.$route.query.Type == "HGyStockPlaceBarCode") {
        let condition = decodeURI(this.handleMessage.linterid.toString());
        sql = `SELECT
                CEILING(CAST(t.row_num AS FLOAT) / 2) AS orderid,
                MAX(CASE WHEN t.row_num % 2 = 1 THEN t.条码编号 END) AS æ¡ç ç¼–号1,
                MAX(CASE WHEN t.row_num % 2 = 1 THEN t.仓位名称 END) AS ä»“位名称1,
                MAX(CASE WHEN t.row_num % 2 = 0 THEN t.条码编号 END) AS æ¡ç ç¼–号2,
                MAX(CASE WHEN t.row_num % 2 = 0 THEN t.仓位名称 END) AS ä»“位名称2
              FROM (
                SELECT
                  æ¡ç ç¼–号, ä»“位名称,
                  ROW_NUMBER() OVER (ORDER BY t1.HItemID) AS row_num
                FROM h_v_IF_StockPlaceList t1 where æ¡ç ç¼–号 in (${condition})
              ) AS t
              GROUP BY CEILING(CAST(t.row_num AS FLOAT) / 2)
              ORDER BY orderid;`;
      }
      axios
        .get(this.baseURL + "/CommonModel/searchMethod", {
          params: {
            sql: sql,
            user: sessionStorage["HUserName"],
            ModRightNameCheck: "",
            // , "HSubID": data[i].hsubid
          },
        })
        .then((response) => {
          let result = response.data;
          this.json_data.recordset = result.data;
          //参数具体说明请参考帮助文档中的“WEB报表(B/S报表)->WEB报表客户端->启动参数说明”部分
          var args = {
            type: "preview", //设置不同的属性可以执行不同的任务,如:preview print pdf xls csv txt rtf img grd
            // report: this.json_report, //report: JSON.stringify(json_report),
            report: urlAddRandomNo("./static/grf/" + OpenTmp + ".grf"),
            data: this.json_data, //data: JSON.stringify(json_data)
          };
          console.log(args, this.json_data);
          webapp_ws_ajax_run(args);
          // var reportViewer = rubylong.grhtml5.insertReportViewer("report_holder", "./static/grf/销售出库单.grf", this.json_data);
          // reportViewer.start();
        })
        .catch((error) => {
          console.log(22222, error);
          this.$modal.msgError("接口请求失败!");
        });
    },
    // created() {
    //     this.ws_both_from_object()
    // },
    methods: {
        // èŽ·å–å‚æ•°_传递的JSON格式参数
        getUrlVars_JSON() {
            var datajson;
            var str = this.propsData; //获取链接中传递的参数
            var arr = str.substring(str.lastIndexOf("=") + 1);
            datajson = JSON.parse(decodeURI(arr));
            return datajson;
        },
        ws_both_from_object() {
            let OpenTmp = decodeURIComponent(this.$route.query.OpenTmp)
            let sql = ''
            if (this.$route.query.Type == 'Kf_SellOutBillList') {
                sql = "exec h_p_Kf_SellOutBillList_PrintSellOutBill " + this.handleMessage.linterid.toString()
            } else if (this.$route.query.Type == 'HGy_BarCodeBill') {
                sql = "select * from h_v_IF_BarCodeBillList where hmainid in(" + this.handleMessage.linterid.toString() + ") order by hmainid desc"
            }else if (this.$route.query.Type == 'HPOInStockBill') {
                sql = "select * from h_v_Sc_PrintMouldProdOutBillList where hmainid=" + this.handleMessage.linterid.toString()+ " order by hmainid"
            }else if(this.$route.query.Type == 'HGyStockPlaceBarCode') {
                let condition = decodeURI(this.handleMessage.linterid.toString())
                console.log(condition)
                sql = "select * from h_v_IF_StockPlaceList where æ¡ç ç¼–号 in (" + condition + ") order by HItemID"
            }
            axios.get(this.baseURL + '/CommonModel/searchMethod', {
                params: {
                    "sql": sql,
                    "user": sessionStorage["HUserName"],
                    "ModRightNameCheck": ''
                    // , "HSubID": data[i].hsubid
                },
            }).then(response => {
                let result = response.data
                this.json_data.recordset = result.data
                //参数具体说明请参考帮助文档中的“WEB报表(B/S报表)->WEB报表客户端->启动参数说明”部分
                var args = {
                    type: "preview", //设置不同的属性可以执行不同的任务,如:preview print pdf xls csv txt rtf img grd
                    // report: this.json_report, //report: JSON.stringify(json_report),
                    report: urlAddRandomNo('./static/grf/' + OpenTmp + '.grf'),
                    data: this.json_data //data: JSON.stringify(json_data)
                };
                console.log(args, this.json_data)
                webapp_ws_ajax_run(args);
                // var reportViewer = rubylong.grhtml5.insertReportViewer("report_holder", "./static/grf/销售出库单.grf", this.json_data);
                // reportViewer.start();
            }).catch(error => {
                console.log(22222, error)
                this.$modal.msgError("接口请求失败!");
            });
        }
    },
}
</script>
  },
};
</script>
src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
@@ -51,7 +51,7 @@
                <el-col :span="6">
                    <el-form-item label="选单号" prop="HSourceBillNo">
                        <el-input v-model="form.HSourceBillNo" placeholder="请输入选单号" disabled>
                            <el-button class="input-search-btn"  slot="append" icon="el-icon-search" @click="openDataDialog(openNum)"></el-button>
                            <el-button class="input-search-btn"  slot="append" icon="el-icon-search" @click="openDataDialog(null)"></el-button>
                        </el-input>
                    </el-form-item>
                </el-col>
@@ -188,7 +188,11 @@
                        </el-table-column>
                        <el-table-column align="center" label="辅助属性代码" prop="HAuxPropNumber" width="120"
                            show-overflow-tooltip>
                            <template slot-scope="scope"><el-input v-model="scope.row.HAuxPropNumber" /></template>
                            <template slot-scope="scope">
                            <el-input v-model="scope.row.HAuxPropNumber"
                            @keyup.native.f7="openDataDialog(1, scope.row)"
                            @dblclick.native="openDataDialog(1, scope.row)" />
                            </template>
                        </el-table-column>
                        <el-table-column align="center" label="辅助属性名称" prop="HAuxPropName" width="120"
                            show-overflow-tooltip>
@@ -256,6 +260,13 @@
        <el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body @close="closeBill">
            <HSourceReportHtml @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName"
                :HOrgID='this.form.HOrgID' :HSouceBillType="HSouceBillType" v-if="ScICMOBillShow" />
                 <GyProperty
                   @deptEmitDb="dbEmitData"
                   @deptEmit="emitData"
                   :openPage="HModName"
                   v-if="propertyShow"
                 />
            <div slot="footer" class="dialog-footer">
                <el-button type="primary" @click="deptClickSub">ç¡® å®š</el-button>
                <el-button @click="deptClose">取 æ¶ˆ</el-button>
@@ -273,10 +284,11 @@
import HSourceReportHtml from '@/views/component/HSourceReportHtml'
import PrintList from "@/views/component/printList";
import moment from 'moment';
import GyProperty from "@/views/basic/gyProperty/gyPropertyList.vue";
export default {
    name: 'Gy_BarCodeBill',
    components: { HSourceReportHtml, PrintList },
    components: { HSourceReportHtml, PrintList, GyProperty },
    props: {
        OperationType: { type: Number, },
        linterid: { type: Number, },
@@ -451,6 +463,7 @@
            materialShow: false,//物料数据组件
            gyEmployeeShow: false,//销售员数据组件
            ScICMOBillShow: false,
            propertyShow: false,
            deptform: {},//弹窗选中数据
            openData: false,//数据弹窗
            dialogTitle: '',
@@ -770,6 +783,17 @@
        },
        //弹窗赋值
        dbEmitData(deptRow, num) {
            if(num) {
                if(num == 'gyProperty') {
                    this.editWlxxData[this.zbIndex].HAuxPropID = deptRow.HItemID;
                    this.editWlxxData[this.zbIndex]["HAuxPropName"] = deptRow["辅助属性名称"];
                    this.editWlxxData[this.zbIndex]["HAuxPropNumber"] = deptRow["辅助属性代码"];
                    this.propertyShow = false;
                    this.openData = false;
                }
                return
            }
            console.log(deptRow)
            if (deptRow.length > 0) {
                this.zbDataShow = false
@@ -1041,8 +1065,9 @@
                                , 'HPOOrderInterID': result.data[i].采购订单内码
                                , 'HPOOrderEntryID': result.data[i].采购订单子内码
                                , 'HPOOrderBillNo': result.data[i].采购订单号
                                , 'HPropertyID': result.data[i].HPropertyID
                                , 'HPropertyName': result.data[i].辅助属性
                                , 'HAuxPropID': result.data[i].HPropertyID
                                , 'HAuxPropName': result.data[i].辅助属性
                                , 'HAuxPropNumber': result.data[i].辅助属性代码
                                , 'HSecUnitID': result.data[i].HSecUnitID
                                , 'HSecUnitName': result.data[i].辅助计量单位
                                , 'HSecUnitRate': result.data[i].换算率
@@ -1195,11 +1220,21 @@
            if (row) {
                this.zbIndex = row.index - 1
            }
            this.showReset()
            this.HSouceBillType = this.getSupType()
            this.dialogTitle = this.getSupType() + '列表'
            this.ScICMOBillShow = true
            this.openData = true
            if(num) {
                switch(num) {
                    case 1:
                    this.dialogTitle = '辅助属性列表'
                    this.propertyShow = true
                    this.openData = true
                    ;break;
                }
            }else {
                this.showReset()
                this.HSouceBillType = this.getSupType()
                this.dialogTitle = this.getSupType() + '列表'
                this.ScICMOBillShow = true
                this.openData = true
            }
        },
    }
src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue
@@ -138,7 +138,7 @@
          <el-row>
            <el-col :span="6">
              <el-form-item label="调入组织" prop="HSTOCKINORGID" >
                <el-select v-model="form.HSTOCKINORGID" placeholder="请选择调入组织" :disabled="OperationType == 3">
                <el-select v-model="form.HSTOCKINORGID" placeholder="请选择调入组织" :disabled="OperationType == 3" @change="StockInOrgChangeHandler">
                  <el-option
                    v-for="(item, index) in organizationList"
                    :key="index"
@@ -632,6 +632,11 @@
    this.getdata();
  },
  methods: {
    StockInOrgChangeHandler() {
        this.editData.forEach(element => {
          element.HSTOCKORGINID = this.form.HSTOCKINORGID
        });
    },
    fetchData() {
      axios
        .get(this.baseURL + "/Web/GetOrganizations", {})
@@ -1034,6 +1039,7 @@
          è¾…单位: "",
          HRemark: "",
          HSTOCKORGID: sessionStorage["OrganizationID"],
          HSTOCKORGINID: this.form.HSTOCKINORGID,
          HPropertyID: 0,
          è¾…助属性: "",
        };