diff --git a/src/utils/LodopFuncs.js b/src/utils/LodopFuncs.js
index 22e2c88..be35e9b 100644
--- a/src/utils/LodopFuncs.js
+++ b/src/utils/LodopFuncs.js
@@ -27,7 +27,7 @@ function getLodop() {
     //LODOP.SET_LICENSES("","7B5624CC84EF99D6B17F27DF4AF4310C", "", ""); //越南的Clodop授权
     let lodopCode = JSON.parse(localStorage.getItem('configParams')).lodopCode
     LODOP.SET_LICENSES("",lodopCode, "", "");
-    LODOP.SET_SHOW_MODE("LANGUAGE",1);
+    LODOP.SET_SHOW_MODE("LANGUAGE",0);
     if (!LODOP && document.readyState !== 'complete') {
       MessageBox.alert('C-Lodop打印控件还没准备好，请稍后再试！')
       return
diff --git a/src/views/modules/label/print_demo_label.js b/src/views/modules/label/print_demo_label.js
index 7b27dbd..f4d7168 100644
--- a/src/views/modules/label/print_demo_label.js
+++ b/src/views/modules/label/print_demo_label.js
@@ -78,8 +78,8 @@ export function printABLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
     }
-    // LODOP.PRINT_DESIGN();
-    LODOP.PREVIEW();
+    LODOP.PRINT_DESIGN();
+    // LODOP.PREVIEW();
     // LODOP.PRINT();
     console.log("操作成功！")
   }
diff --git a/src/views/modules/label/print_issureSo_label.js b/src/views/modules/label/print_issureSo_label.js
new file mode 100644
index 0000000..df1c8f6
--- /dev/null
+++ b/src/views/modules/label/print_issureSo_label.js
@@ -0,0 +1,54 @@
+/*调用js打印标签*/
+import getLodop from '@/utils/LodopFuncs.js'
+/*打印材料卷标签*/
+export function printIssureSoLabel(printList) {
+  const LODOP = getLodop()
+  if (LODOP) {
+
+    //循环调用打印机
+    for(let i = 0; i < printList.length; i++){
+      let printData = printList[i];
+      LODOP.NewPage();
+      LODOP.SET_PRINT_PAGESIZE(2,360,1180,"");
+      LODOP.ADD_PRINT_BARCODE(6,20,139,106,"QRCode",printData.site+','+printData.rollNo);
+      LODOP.ADD_PRINT_TEXT(11,120,108,25,"Part No:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(41,120,108,25,"Part Desc:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(71,120,108,25,"Lot No:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(101,120,96,25,"Man.Date:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(11,321,108,25,"Order No:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(101,12,108,25,printData.rollNo);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
+      LODOP.ADD_PRINT_TEXT(101,321,108,25,"Exp.Date:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(11,203,128,25,printData.partNo);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(41,203,303,25,printData.partDesc);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(71,203,128,25,printData.batchNo);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(101,203,128,25,printData.manufactureDate);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(11,391,118,25,printData.orderRef1);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(101,391,118,25,printData.expiredDate);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(71,261,108,25,"Dev.Date：");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      LODOP.ADD_PRINT_TEXT(71,331,200,25,printData.enterDate);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+    }
+    // LODOP.PRINT_DESIGN();
+    LODOP.PREVIEW();
+    // LODOP.PRINT();
+    console.log("操作成功！")
+  }
+}
+
diff --git a/src/views/modules/label/print_poReceive_label.js b/src/views/modules/label/print_poReceive_label.js
new file mode 100644
index 0000000..9592f81
--- /dev/null
+++ b/src/views/modules/label/print_poReceive_label.js
@@ -0,0 +1,49 @@
+/*调用js打印标签*/
+import getLodop from '@/utils/LodopFuncs.js'
+/*打印材料卷标签*/
+export function printPoReceiveLabel(printList) {
+  const LODOP = getLodop()
+  if (LODOP) {
+
+    //循环调用打印机
+    for(let i = 0; i < printList.length; i++){
+      let printData = printList[i];
+      LODOP.NewPage();
+      LODOP.SET_PRINT_PAGESIZE(2,360,1180,"");
+      LODOP.ADD_PRINT_BARCODE(6,20,139,106,"QRCode",printData.site+','+printData.rollNo);
+      LODOP.ADD_PRINT_TEXT(11,120,108,25,"Part No:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(41,120,108,25,"Part Desc:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(71,120,108,25,"Lot No:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(101,120,96,25,"Man.Date:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(11,321,108,25,"Order No:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(101,12,108,25,printData.rollNo);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
+      LODOP.ADD_PRINT_TEXT(101,321,108,25,"Exp.Date:");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(11,203,128,25,printData.partNo);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(41,203,303,25,printData.partDesc);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(71,203,128,25,printData.batchNo);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(101,203,128,25,printData.manufactureDate);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(11,391,118,25,printData.orderRef1);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+      LODOP.ADD_PRINT_TEXT(101,391,118,25,printData.expiredDate);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
+
+    }
+    // LODOP.PRINT_DESIGN();
+    LODOP.PREVIEW();
+    // LODOP.PRINT();
+    console.log("操作成功！")
+  }
+}
+
diff --git a/src/views/modules/material/com_issureSo_add_or_update.vue b/src/views/modules/material/com_issureSo_add_or_update.vue
index 1ce3a61..757fae9 100644
--- a/src/views/modules/material/com_issureSo_add_or_update.vue
+++ b/src/views/modules/material/com_issureSo_add_or_update.vue
@@ -115,6 +115,9 @@
 </template>
 
 <script>
+  import {
+    printIssureSoLabel,
+  } from "@/views/modules/label/print_issureSo_label.js"
   import {
 
   } from "@/api/base/normalSearch.js"
@@ -494,6 +497,7 @@
         finalSaveTransHeaderDetail(this.dataForm).then(({data})=>{
           //区分请求成功和失败的状况
           if (data && data.code == 0) {
+            printIssureSoLabel(data.rows);
             this.$message.success( '操作成功')
             this.visible = false
             this.$emit('refreshDataList')
diff --git a/src/views/modules/material/com_poReceiving_add_or_update.vue b/src/views/modules/material/com_poReceiving_add_or_update.vue
index cdbfa40..05b9bda 100644
--- a/src/views/modules/material/com_poReceiving_add_or_update.vue
+++ b/src/views/modules/material/com_poReceiving_add_or_update.vue
@@ -285,6 +285,9 @@
     ,deleteSubCach
 
   } from "@/api/material/poReceive.js"
+  import {
+    printPoReceiveLabel,
+  } from "@/views/modules/label/print_poReceive_label.js"
   import Chooselist from '@/views/modules/common/Chooselist'
   import {searchTransDetail} from "../../../api/material/poReceive";
   export default {
@@ -693,6 +696,7 @@
         finalSaveTransHeaderDetail(this.dataForm).then(({data})=>{
           //区分请求成功和失败的状况
           if (data && data.code == 0) {
+            printPoReceiveLabel(data.rows);
             this.$message.success( '操作成功')
             this.visible = false
             this.$emit('refreshDataList')
diff --git a/src/views/modules/material/com_productionStock_add_or_update.vue b/src/views/modules/material/com_productionStock_add_or_update.vue
index 42ea255..8603961 100644
--- a/src/views/modules/material/com_productionStock_add_or_update.vue
+++ b/src/views/modules/material/com_productionStock_add_or_update.vue
@@ -83,7 +83,6 @@
         :data="dataList"
         height="300"
         border
-        :row-class-name="tableRowClassName"
         v-loading="false"
         style="width: 100%; ">
         <el-table-column
@@ -382,7 +381,7 @@
           }
           if (val === 117) {
             if(type==1) {
-              strVal = this.dataForm.partNo
+              strVal = this.dataForm.locationId
               sql= " and warehouse_id = '"+this.dataForm.warehouseID+"' "
             }
           }
@@ -397,7 +396,12 @@
             this.dataForm.partDesc = val.part_desc
           }
         }
+        if (this.tagNo === 117) {
+          if(this.tagNo1==1) {
+            this.dataForm.locationId = val.location_id
 
+          }
+        }
       },
       init (row) {
         this.rollData={
@@ -417,7 +421,8 @@
                 transDate:dataRow.transDate,
                 receiverName:dataRow.receiverName,
                 orderRef1:dataRow.orderRef1,
-               scanSerialNo:'',
+                locationId: '',
+                scanSerialNo:'',
             }
             let inData2={
               site:row.site,
@@ -582,17 +587,6 @@
           }
         })
       },
-      tableRowClassName ({row, rowIndex}) {
-        // var currentDate = new Date();
-        // var futureDate = new Date();
-        // futureDate.setDate(currentDate.getDate() + 90);
-        // var date = new Date(row.expiredDate)
-        // if (date.getTime() < futureDate.getTime()) {
-        //   console.log('快过期了')
-        //   return 'error-row'
-        // }
-        return ''
-      },
 
 
     },
diff --git a/src/views/modules/material/issureSo.vue b/src/views/modules/material/issureSo.vue
index b48cf47..947d220 100644
--- a/src/views/modules/material/issureSo.vue
+++ b/src/views/modules/material/issureSo.vue
@@ -129,6 +129,16 @@
           border
           v-loading="dataListLoading"
           style="width: 100%; ">
+          <el-table-column
+            header-align="center"
+            align="center"
+            width="80"
+            fixed="left"
+            label="操作">
+            <template slot-scope="scope">
+              <a type="text" size="small" @click="printLabel(scope.row)">打印标签</a>
+            </template>
+          </el-table-column>
           <el-table-column
             v-for="(item,index) in columnList3" :key="index"
             :sortable="item.columnSortable"
@@ -208,6 +218,9 @@
     ,saveTransHeaderData
     ,deleteTransHeaderData
   } from "@/api/material/issureSo.js"
+  import {
+    printIssureSoLabel,
+  } from "@/views/modules/label/print_issureSo_label.js"
   import {
     getLocationListForSearch
   } from "@/api/base/normalSearch.js"
@@ -907,6 +920,12 @@
           this.$refs.addOrUpdate.init(data)
         })
       },
+      printLabel(row){
+        let rows=[];
+        rows.push(row)
+
+        printIssureSoLabel(rows);
+      },
       //导出excel
       //导出excel
       async createExportData() {
diff --git a/src/views/modules/material/poReceiving.vue b/src/views/modules/material/poReceiving.vue
index 3a5558e..e75ea84 100644
--- a/src/views/modules/material/poReceiving.vue
+++ b/src/views/modules/material/poReceiving.vue
@@ -129,6 +129,16 @@
           border
           v-loading="dataListLoading"
           style="width: 100%; ">
+          <el-table-column
+            header-align="center"
+            align="center"
+            width="80"
+            fixed="left"
+            label="操作">
+            <template slot-scope="scope">
+              <a type="text" size="small" @click="printLabel(scope.row)">打印标签</a>
+            </template>
+          </el-table-column>
           <el-table-column
             v-for="(item,index) in columnList3" :key="index"
             :sortable="item.columnSortable"
@@ -213,6 +223,9 @@
   } from "@/api/base/normalSearch.js"
   import addOrUpdate from './com_poReceiving_add_or_update'
   import Chooselist from '@/views/modules/common/Chooselist'
+  import {
+    printPoReceiveLabel,
+  } from "@/views/modules/label/print_poReceive_label.js"
   export default {
     components: {
       Chooselist
@@ -587,6 +600,40 @@
             status: true,
             fixed: '',
             columnWidth: 120
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 200001,
+            serialNumber: '200001Table3PartNo',
+            tableId: "200001Table3",
+            tableName: "采购入库卷明细",
+            columnProp: "partNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "物料编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 200001,
+            serialNumber: '200001Table3PartDesc',
+            tableId: "200001Table3",
+            tableName: "采购入库卷明细",
+            columnProp: "partDesc",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "物料名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
           },{
             userId: this.$store.state.user.name,
             functionId: 200001,
@@ -907,6 +954,12 @@
           this.$refs.addOrUpdate.init(data)
         })
       },
+      printLabel(row){
+        let rows=[];
+        rows.push(row)
+
+        printPoReceiveLabel(rows);
+      },
       //导出excel
       //导出excel
       async createExportData() {