| public/static/grf/物料条码.grf | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/component/HSourceReportHtml/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
public/static/grf/ÎïÁÏÌõÂë.grf
@@ -1,375 +1,93 @@ Object Report Version='6.8.2.5' Title='ç产任å¡å' PrintAsDesignPaper=F Object Font Name='å®ä½' Size=135000,0 Weight=400 Charset=134 End Object Printer Size=256 Width=9.75 Height=6 LeftMargin=0 TopMargin=0 RightMargin=0 BottomMargin=0 End Object DetailGrid CenterView=T ShowColLine=F ShowRowLine=F Object Border Styles=[] End Object Recordset Items Field Item Name='ç产工åå·' DBFieldName='æºååå·' End Item Name='ç©æä»£ç ' End Item Name='ç©æåç§°' End Item Name='è§æ ¼åå·' End Item Name='æ°é' End Item Name='æ¡ç ç¼å·' End Item Name='éå®è®¢åå·' End Item Name='æ¹å·' End Item Name='æ¥æ' Type=DateTime Format='yyyy/MM/dd' End Item Name='å¶ä½äºº' End Item Name='客æ·åå·' End Item Name='计éåä½' End Item Name='æºååå·' End Item Name='ä¾åºå' End End End Items Column Item Name='Column3' Width=9.60438 End End Object ColumnContent Height=6.00604 RowsPerPage=1 Items ColumnContentCell Item Column='Column3' FreeCell=T CanGrow=T Items Control Item Type=MemoBox Name='å¯è´å¥ç¹' Left=0.79375 Top=0.211667 Width=5.3975 Height=1.37583 Object Font Name='å®ä½' Size=142500,0 Weight=400 Charset=134 End ShrinkFontToFit=T TextAlign=MiddleCenter CharSpacing=4 Text='æ¡ç ä¿¡æ¯' End Item Type=Barcode Name='Barcode1' Left=6.79979 Top=0.211667 Width=1.79917 Height=1.37583 BarcodeType=QRCode CaptionPosition=None Text='[#æ¡ç ç¼å·#]' Object Font Name='å®ä½' Size=105000,0 Weight=400 Charset=134 End End Item Type=FreeGrid Name='FreeGrid1' Left=0.132292 Top=1.69333 Object Border Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom] End ColumnCount=6 Items FreeGridColumn Item[1] Width=1.56104 End Item[2] Width=1.85208 End Item[3] Width=1.16417 End Item[4] Width=1.69333 End Item[5] Width=1.00542 End Item[6] Width=2.11667 End End Items FreeGridRow Item[1] Height=0.820208 End Item[2] Height=0.79375 End Item[3] Height=0.79375 End Item[4] Height=0.820208 End Item[5] Height=0.740833 End End Items FreeGridCell Item[1,1] Object Font Name='å®ä½' Weight=400 Charset=134 End Text='å·¥åå·' End Item[1,2] Object Font Name='å®ä½' Size=105000,0 Weight=400 Charset=134 End ShrinkFontToFit=T Text='[#ç产工åå·#]' ColSpan=2 End Item[1,4] Object Font Name='å®ä½' Size=105000,0 Weight=400 Charset=134 End Text='ä¾åºå' End Item[1,5] Object Font Name='å®ä½' Size=105000,0 Weight=400 Charset=134 End Text='[#ä¾åºå#]' ColSpan=2 End Item[2,1] Object Font Name='å®ä½' Size=105000,0 Weight=400 Charset=134 End Text='ç©æç¼ç ' End Item[2,2] Object Font Name='å®ä½' Size=105000,0 Weight=400 Charset=134 End Text='[#ç©æä»£ç #]' ColSpan=5 End Item[3,1] Object Font Name='å®ä½' Size=105000,0 Weight=400 Charset=134 End Text='ç©æåç§°' End Item[3,2] Object Font Name='å®ä½' Size=105000,0 Weight=400 Charset=134 End Text='[#ç©æåç§°#]' ColSpan=5 End Item[4,1] Object Font Name='å®ä½' Size=105000,0 Weight=400 Charset=134 End Text='æ°é' DataName='æ°é' End Item[4,2] Object Font Name='å®ä½' Size=105000,0 Weight=400 Charset=134 End Text='[#æ°é#]' End Item[4,3] Object Font Name='å®ä½' Size=105000,0 Weight=400 Charset=134 End Text='åä½' DataName='åä½' End Item[4,4] Object Font Name='å®ä½' Size=105000,0 Weight=400 Charset=134 End Text='[#计éåä½#]' End Item[4,5] Object Font Name='å®ä½' Size=105000,0 Weight=400 Charset=134 End Text='æ¹å·' End Item[4,6] Object Font Name='å®ä½' Size=105000,0 Weight=400 Charset=134 End Text='[#æ¹å·#]' End Item[5,1] Object Font Name='å®ä½' Size=105000,0 Weight=400 Charset=134 End Text='æå°äººå' DataName='æå°äººå' End Item[5,2] Object Font Name='å®ä½' Size=105000,0 Weight=400 Charset=134 End Text='[#å¶ä½äºº#]' ColSpan=2 End Item[5,4] Object Font Name='å®ä½' Size=105000,0 Weight=400 Charset=134 End Text='æå°æ¥æ' DataName='æå°æ¥æ' End Item[5,5] Object Font Name='å®ä½' Size=105000,0 Weight=400 Charset=134 End Text='[#æ¥æ#]' ColSpan=2 End End End End End End End Object ColumnTitle Height=0 Items ColumnTitleCell Item GroupTitle=F Column='Column3' Text='Column1' End End End End Items ReportHeader Item Name='ReportHeader1' Height=0 RepeatOnPage=T End End Items ReportFooter Item Name='ReportFooter1' Height=0 End End End { "Version":"6.8.2.2", "Title":"1a.ç®åè¡¨æ ¼", "Author":"éæµªæ¥è¡¨è½¯ä»¶", "Description":"æ¼ç¤ºä¸ä¸ªæåºæ¬çå表æ¥è¡¨ã", "Font":{ "Name":"å®ä½", "Size":90000, "Weight":400, "Charset":134 }, "Printer":{ "Size":256, "Width":9, "Height":6, "LeftMargin":0, "TopMargin":0, "RightMargin":0, "BottomMargin":0 }, "DetailGrid":{ "CenterView":true, "PrintAdaptMethod":"ResizeToFit", "Recordset":{ "ConnectionString":"xml", "QuerySQL":"éå®åºåºå.txt", "Field":[ { "Name":"æ¡ç ç¼å·" } ] }, "Column":[ { "Name":"åæ®å·", "Width":8.78417 } ], "ColumnContent":{ "Height":3.41313, "ColumnContentCell":[ { "Column":"åæ®å·", "FreeCell":true, "Control":[ { "Type":"StaticBox", "Name":"StaticBox1", "Left":0.396875, "Top":0.211667, "Width":8.20208, "Height":2.98979 }, { "Type":"Barcode", "Name":"Barcode1", "Left":0.211667, "Top":0.396875, "Width":4.39208, "Height":2.59292, "BarcodeType":"QRCode", "Text":"[#æ¡ç ç¼å·#]" } ] } ] }, "ColumnTitle":{ "BackColor":"C0C0C0", "Height":0, "Font":{ "Name":"å®ä½", "Size":90000, "Bold":true, "Charset":134 }, "RepeatStyle":"OnPage", "ColumnTitleCell":[ { "GroupTitle":false, "Column":"åæ®å·", "BackColor":"FFFFFF", "TextAlign":"MiddleCenter" } ] } }, "ReportHeader":[ { "Height":0 } ] } src/views/component/HSourceReportHtml/index.vue
@@ -2,13 +2,19 @@ <div style="padding: 10px; position: relative;"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px" class="searchBox"> <el-form-item label="åæ®å·" prop="HBillNo" style="margin-left: 100px"> <el-input v-model="queryParams.HBillNo" placeholder="请è¾å ¥åæ®å·" @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.HBillNo" placeholder="请è¾å ¥åæ®å·" style="width: 150px" /> </el-form-item> <el-form-item label="é¨é¨"> <el-form-item label="é¨é¨" label-width="48px"> <el-select v-model="queryParams.HDeptName" placeholder="è¯·éæ©" style="width: 150px"> <el-option v-for="(item, index) in HDeptList" :key="index" :label="item.HName" :value="item.HName" /> :value="item.HItemID" /> </el-select> </el-form-item> <el-form-item label="æµè½¬å¡å·" prop="HProcExchBillNo" v-if="HSouceBillType == 'çäº§å ¥åºå'"> <el-input v-model="queryParams.HProcExchBillNo" placeholder="请è¾å ¥æµè½¬å¡å·" style="width: 150px" /> </el-form-item> <el-form-item label="ç©æç¼ç " prop="PartNumber"> <el-input v-model="queryParams.PartNumber" placeholder="请è¾å ¥ç©æç¼ç " style="width: 150px" /> </el-form-item> <el-form-item label-width="78px"> <el-button type="primary" icon="el-icon-search" @click="handleQuery"> @@ -18,21 +24,33 @@ <el-collapse v-model="activeSeach"> <el-collapse-item title="æ´å¤" name="1"> <el-card class="box-card"> <el-form-item label="é¨é¨åç§°" prop="HDepartName"> <el-input v-model="queryParams.HDepartName" placeholder="请è¾å ¥é¨é¨åç§°" @keyup.enter.native="HDepartName" /> <el-form-item label="ç©æåç§°" prop="PartName"> <el-input v-model="queryParams.PartName" placeholder="请è¾å ¥ç©æåç§°" /> </el-form-item> <el-form-item label="ç©æä»£ç " prop="HMaterNumber"> <el-input v-model="queryParams.HMaterNumber" placeholder="请è¾å ¥ç©æä»£ç " @keyup.enter.native="handleQuery" /> <el-form-item label="ç¶æ" prop="HBillStatus"> <el-select v-model="queryParams.HBillStatus" placeholder="è¯·éæ©"> <el-option label="计å" value="计å" /> <el-option label="计å确认" value="计å确认" /> <el-option label="ä¸è¾¾" value="ä¸è¾¾" /> <el-option label="å¼å·¥" value="å¼å·¥" /> <el-option label="å®å·¥" value="å®å·¥" /> <el-option label="ç»æ¡" value="ç»æ¡" /> <el-option label="ç»æ¡" value="ç»ç®" /> </el-select> </el-form-item> <el-form-item label="ç©æåç§°" prop="HMaterName"> <el-input v-model="queryParams.HMaterName" placeholder="请è¾å ¥ç©æåç§°" @keyup.enter.native="handleQuery" /> <el-form-item label="é¢æç¶æ" prop="HSPickMtrlStatus" v-if="HSouceBillType == 'ç产订å'"> <el-select v-model="queryParams.HSPickMtrlStatus" placeholder="è¯·éæ©"> <el-option label="æªé¢æ" value="æªé¢æ" /> <el-option label="é¨å颿" value="é¨å颿" /> <el-option label="å ¨é¨é¢æ" value="å ¨é¨é¢æ" /> <el-option label="è¶ é¢é¢æ" value="è¶ é¢é¢æ" /> </el-select> </el-form-item> <el-form-item label="ä»åº" prop="HWHID"> <el-input v-model="queryParams.HWHID" placeholder="请è¾å ¥ä»åº" @keyup.enter.native="handleQuery" /> <el-form-item label="æ¯å¦æäº§" prop="HIsScheduling" v-if="HSouceBillType == 'ç产订å'"> <el-select v-model="queryParams.HIsScheduling" placeholder="è¯·éæ©"> <el-option label="å·²æäº§" value="å·²æäº§" /> <el-option label="æªæäº§" value="æªæäº§" /> </el-select> </el-form-item> <div slot="header" class="clearfix"><span>è¿æ»¤</span></div> <div> @@ -54,8 +72,7 @@ </el-select> </el-col> <el-col :span="11"> <el-input v-model="queryParams.ColContent1" placeholder="请è¾å ¥" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.ColContent1" placeholder="请è¾å ¥" clearable /> </el-col> </el-row> </el-form-item> @@ -166,10 +183,12 @@ queryParams: { HBillNo: "", HDeptName: '', HDepartName: "", HWHID: null, HMaterNumber: "", HMaterName: "", HProcExchBillNo: "", PartNumber: "", PartName: "", HBillStatus: 'å¼å·¥', HSPickMtrlStatus: "", HIsScheduling: "", ColName1: "", ColName2: "", ColName: "", @@ -266,6 +285,17 @@ if (this.pageSize == 0) { this.pageSize = 50; } if (this.queryParams.HBillStatus &&this.HSouceBillType == 'ç产订å') { this.sWhere += " and ç¶æ = '" + this.queryParams.HBillStatus + "'"; } if (this.HSouceBillType == 'ç产订å') { this.queryParams.HIsScheduling = 'å·²æäº§' if (sessionStorage["Organization"] == "ä¹è±çµæº") { if (this.queryParams.HIsScheduling) { this.sWhere += this.queryParams.HIsScheduling == "æªæäº§" ? "and æ¯å¦æäº§ = ''" : " and æ¯å¦æäº§ = '" + this.queryParams.HIsScheduling + "'" } } } // å表 axios.get(this.baseURL + "/Sc_BarCode/ReportFromBillList", { params: { @@ -293,6 +323,10 @@ name: data1.list[key].ColmCols, Type: data1.list[key].ColmType, }); //仿¯ä¸ªå¯¹è±¡ä¸æåæ°æ® var patrn = new RegExp(/^h/i); if (patrn.test(data1.list[key].ColmCols)) { this.titleData[key] = data1.list[key].ColmCols; } } //å¨å表左边添å å¾éæ¡ col.push({ type: "checkbox", fixed: "left", totalRowText: "å计" }); @@ -640,17 +674,28 @@ if (this.queryParams.HBillNo) { this.sWhere += " and åæ®å· like '%" + this.queryParams.HBillNo + "%'"; } if (this.queryParams.HDepartName) { this.sWhere += " and é¨é¨åç§° like '%" + this.queryParams.HDepartName + "%'"; if (this.queryParams.HProcExchBillNo &&this.HSouceBillType == 'çäº§å ¥åºå') { this.sWhere += " and æµè½¬å¡å· like '%" + this.queryParams.HProcExchBillNo + "%'"; } if (this.queryParams.HWHID) { this.sWhere += " and ä»åº like '%" + this.queryParams.HWHID + "%'"; if (this.queryParams.HDeptName) { this.sWhere += " and HDeptID = '" + this.queryParams.HDeptName + "'"; } if (this.queryParams.HMaterNumber) { this.sWhere += " and ç©æä»£ç like '%" + this.queryParams.HMaterNumber + "%'"; if (this.queryParams.PartNumber) { this.sWhere += " and ç©æä»£ç like '%" + this.queryParams.PartNumber + "%'"; } if (this.queryParams.HMaterName) { this.sWhere += " and ç©æåç§° like '%" + this.queryParams.HMaterName + "%'"; if (this.queryParams.PartName) { this.sWhere += " and ç©æåç§° like '%" + this.queryParams.PartName + "%'"; } if (this.queryParams.HBillStatus &&this.HSouceBillType == 'ç产订å') { this.sWhere += " and ç¶æ like '%" + this.queryParams.HBillStatus + "%'"; } if (sessionStorage["Organization"] == "ä¹è±çµæº" && this.HSouceBillType == 'ç产订å') { if (this.queryParams.HIsScheduling) { this.sWhere += " and é¢æç¶æ like '%" + this.queryParams.HIsScheduling + "%'"; } if (this.queryParams.HIsScheduling) { this.sWhere += this.queryParams.HIsScheduling == "æªæäº§" ? "and æ¯å¦æäº§ = ''" : " and æ¯å¦æäº§ = '" + this.queryParams.HIsScheduling + "'" } } this.getList(); }, src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
@@ -225,7 +225,7 @@ </el-tab-pane> <el-tab-pane label="æ¡ç ä¿¡æ¯" name="tiaoma"> <el-table :data="editTmData" style="width: 100%" height="480" width="100%" ref="tbzbTable" @selection-change="handleTableWlxxZbEdit" :row-class-name="tiaomaZbIndex" border> @selection-change="handleTableWlxxZbEdit" :row-class-name="tiaomaZbIndex" border v-if="editTmData.length>0"> <el-table-column align="center" label="åºå·" type="index" width="80" fixed /> <template v-for="(item, index) in tmBtList"> <el-table-column align="center" :prop="item.field" :label="item.title" :width="item.width" @@ -235,7 +235,7 @@ </el-tab-pane> <el-tab-pane label="æ¡£æ¡å表" name="dangan"> <el-table :data="editDaData" style="width: 100%" height="480" width="100%" ref="dazbTable" @selection-change="handleTableDangan" :row-class-name="danganZbIndex" border> @selection-change="handleTableDangan" :row-class-name="danganZbIndex" border v-if="editDaData.length>0"> <el-table-column type="selection" width="55" align="center" /> <el-table-column align="center" label="åºå·" type="index" width="80" fixed /> <template v-for="(item, index) in daBtList"> @@ -251,7 +251,7 @@ </el-tabs> </el-form> <!-- é¨é¨å¼¹çª --> <el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body> <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" /> <div slot="footer" class="dialog-footer"> @@ -521,6 +521,9 @@ this.getdata() }, methods: { closeBill(){ this.ScICMOBillShow=false }, get_PrintReport() { if (this.danganSelList.length == 0) { this.$modal.msgError("è¯·éæ©æ°æ®");