Fixiaobai
2023-12-07 24c2d968b683c1b5b15bed651dd088cdd0f0839d
Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
已修改3个文件
28 ■■■■ 文件已修改
src/views/equipment/equipment/index.vue 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/plan/manufacturingorder/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
vue.config.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/equipment/equipment/index.vue
@@ -19,11 +19,11 @@
        @refreshDataList="getData"
      ></table-form>
      <el-dialog title="标签列表" :visible.sync="diaPrintTab" width="500px">
        <div class="dia_body">
          <el-card class="box-card" id="printRaw" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 30px;">
        <div class="dia_body" id="printRaw">
          <el-card class="box-card" v-for="(tem, i) in multipleSelection" :key="i" style="margin-bottom: 30px; font-size: 16px !important;">
            <el-row>
              <el-col :span="8" :offset="1">序号:</el-col>
              <el-col :span="7" style="font-weight: bold;">{{ i + 1 }}</el-col>
              <el-col :span="7" style="font-weight: bold;">{{ tem.id }}</el-col>
            </el-row>
            <el-row>
              <el-col :span="8" :offset="1">编号:</el-col>
@@ -43,7 +43,7 @@
        </div>
        <span slot="footer" class="dialog-footer">
          <el-button @click="diaPrintTab = false">取 消</el-button>
          <el-button type="primary" @click="printFun()">打 印</el-button>
          <el-button type="primary" @click="printFun">打 印</el-button>
        </span>
      </el-dialog>
    </basic-container>
@@ -289,13 +289,23 @@
    printFun() {
            // this.printDialogVisible = false;
            this.diaPrintTab = false;
            console.log(printRaw);
            PrintJS({
                printable: "printRaw",//页面
                printable: 'printRaw',//页面
                type: "html",//文档类型
                  maxWidth:450,
                  targetStyles:['*'],                 
                  style:"@page {margin:0  ;resolution: 300dpi;portrait}",
                  style: `@page {
                    margin:0;
                    size: 360px 175px;
                  }
                  hrml{
                    zoom:100%;
                  }
                  @media print{
                    width: 360px;
                    height: 175px;
                    margin:0;
                  }`,
                  onPrintDialogClose: this.erexcel=false,
                  targetStyles: ["*"], // 使用dom的所有样式,很重要
                  font_size: '',
src/views/plan/manufacturingorder/index.vue
@@ -1419,6 +1419,7 @@
    },
    // table自带事件
    handleSelectionChange(val) {
      console.log(val,"一行");
      let orderData = []
      orderData =val.map( el =>{
         return{
vue.config.js
@@ -3,11 +3,12 @@
 * https://cli.vuejs.org/zh/config/
 */
// const url = 'http://192.168.2.7:9999'
const url = 'http://192.168.32.45:9999'
//const url = 'http://192.168.2.7:9999'
//const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.0.23:9999'
 const url = 'http://localhost:9999'
//  const url = 'http://localhost:9999'
// const url = 'http://ztt-gateway:9999'
const localUrl = 'http://localhost:8089'