Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

zouyu

2024-01-19 0521790cf8e22f0e2a015a4b6989500727459342

Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

 src/api/equipment/mould.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
import request from '@/router/axios'

export function page(query) {
    return request({
        url:'/mes/mould/page',
        method:'get',
        params: query
    })
}

 src/views/equipment/mould/index.vue

@@ -131,7 +131,8 @@
    ...mapGetters(['permissions'])
  },
  components: {
    ttable
    ttable,
    TableForm
  },
  watch: {
    dialogVisible(newVal){

 src/views/equipment/mould/mould-from.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,200 @@
<template>
    <el-dialog
      :title="!dataForm.id ? '新增' : '修改'"
      :close-on-click-modal="false"
      :visible.sync="visible"
    >
      <el-form
        :model="dataForm"
        :rules="dataRule"
        ref="dataForm"
        label-width="80px"
        class="l-mes"
      >
        <el-row>
          <el-col :span="12">
            <el-form-item label="编号" prop="number">
              <el-input v-model="dataForm.number" placeholder="编号"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="名称" prop="name">
              <el-input v-model="dataForm.name" placeholder="名称"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="工厂" prop="factoryId">
              <el-select
                v-model="dataForm.factoryId"
                filterable
                placeholder="请选择"
                style="width:100%"
              >
                <el-option
                  v-for="(item, index) in this.factoryOptions"
                  :label="item.factoryName"
                  :value="item.id"
                  :key="index"
                >
                </el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="所属车间" prop="workshop">
              <el-select
                v-model="dataForm.workshop"
                filterable
                placeholder="请选择"
                style="width:100%"
              >
                <el-option
                  v-for="item in workshopList"
                  :key="item.id"
                  :label="item.label"
                  :value="item.value"
                >
                </el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="位置" prop="position">
              <el-input v-model="dataForm.position" placeholder="位置"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="邮箱" prop="email">
              <el-input v-model="dataForm.email" placeholder="邮箱"></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="供应商" prop="supplier">
              <el-input
                v-model="dataForm.supplier"
                placeholder="供应商"
              ></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="制造商" prop="manufacturer">
              <el-input
                v-model="dataForm.manufacturer"
                placeholder="制造商"
              ></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="型号规格" prop="typeSpecification">
              <el-input
                v-model="dataForm.typeSpecification"
                placeholder="型号规格"
              ></el-input>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="制造日期" prop="manufactureDate">
              <el-date-picker
                style="width: 100%"
                v-model="dataForm.manufactureDate"
                type="date"
                placeholder="选择日期"
                value-format="yyyy-MM-dd HH:mm:ss"
              >
              </el-date-picker>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="安装日期" prop="installDate">
              <el-date-picker
                style="width: 100%"
                v-model="dataForm.installDate"
                type="date"
                placeholder="选择日期"
                value-format="yyyy-MM-dd HH:mm:ss"
              >
              </el-date-picker>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="状态" prop="state">
              <el-select
                v-model="dataForm.state"
                placeholder="状态"
                filterable
                style="width: 100%"
              >
                <el-option
                  v-for="item in equipmentState"
                  :key="item.id"
                  :label="item.label"
                  :value="item.label"
                />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="设备描述" prop="desc">
              <el-input
                v-model="dataForm.description"
                placeholder="设备描述"
              ></el-input>
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <span slot="footer" class="dialog-footer">
        <el-button @click="visible = false">取消</el-button>
        <el-button
          type="primary"
          :disabled="isSubmit"
          v-thinclick="`dataFormSubmit`"
          >确定</el-button
        >
      </span>
    </el-dialog>
  </template>
  <script>
  import { getObj, addObj, putObj } from '@/api/equipment/equipment'
  import { loadFactoryList } from '@/api/basic/factory'
  import { remote } from '../../../api/admin/dict'
  export default {
    data() {
      return {
        // options: regionData,
        visible: false,
        dataForm: {
          id: 0,
          number: '',
          name: '',
          factoryId: '',
          workshop: '',
          position: '',
          email: '',
          supplier: '',
          manufacturer: '',
          typeSpecification: '',
          manufactureDate: '',
          installDate: '',
          state: '',
          description: '',
          value1: ''
        },
        dataRule: {
          number: [{ required: true, message: '编号不能为空', trigger: 'blur' }],
          name: [{ required: true, message: '名称不能为空', trigger: 'blur' }]
        },
        factoryOptions: [],
        equipmentState: [],
        isSubmit: false,
        workshopList: []
      }
    },
    methods: {
    },
  
    created() {
    }
  }
  </script>
  

 src/views/quality/Packaging_ledger/index.vue

@@ -141,7 +141,55 @@
        <div style="width:100%;height: 400px;overflow-y: auto;">
          <div id="qrCard" class="dia_body">
            <el-card class="box-card" v-for="(item, i) in qrData" :key="i" style="margin-bottom: 10px;">
              <el-row>
              <div style="padding: 5px;">
                  <table border="2px" class="x1111116">
                      <tr class="x1111113">
                            <td class="x1111114" colspan=6>
                              <div style="height: 75px;display: flex;margin-top: 2px;">
                                  <div style="margin-top: 5px;">
                                  <img width="150" height="48"  src="../../../../public/img/image001.jpg" alt="IMG_256">
                                  </div>
                                  <div style="margin-left: 45px;margin-top: 15px ;">
                                    <span lang="EN-US" class="x1111111">中天海洋科技有限公司</span>
                                  </div>
                              </div>
                            </td>
                      </tr>
                      <tr class="x1111117">
                            <td class="x1111114">
                              <span style="font-family: å®‹ä½“;text-align: center;">序&nbsp;&nbsp;号:</span>
                            </td>
                            <td class="x1111114"  colspan=4 >{{ i + 1 }} </td>
                            <td class="x1111114"  rowspan=3  >
                              <div style="padding: 1px;">
                              <vueQr :text=str+item.packageBoxId :size="110" :margin="1"></vueQr>
                              </div>
                            </td>
                      </tr>
                      <tr class="x1111117">
                            <td class="x1111114">
                              <span style="font-family: å®‹ä½“;text-align: center;">包 è£… ç¼–号：</span>
                            </td>
                            <td class="x1111114" colspan=4>{{ item.packageNo }}</td>
                      </tr>
                      <tr class="x1111117">
                            <td class="x1111114">
                              <span style="font-family: å®‹ä½“;text-align: center;">合&nbsp;同&nbsp;号：</span>
                            </td>
                            <td class="x1111114" colspan=4>{{ item.contractNo }}</td>
                            
                      </tr>
                      <tr class="x1111113">
                        <td class="x1111114" colspan=6>
                          <div style="height: 75px;" >
                                  <p><span lang="EN-US" class="x1111112">地址：江苏省南通经济技术开发区常兴路96号</span></p>
                                  <p><span lang="EN-US" class="x1111112">电话/传真：0513—89191125</span></p>
                          </div>
                        </td>
                      </tr>
                  </table>
              </div>
              <!-- <el-row>
                <el-col :span="10" :offset="3">序号：</el-col>
                <el-col :span="10" style="font-weight: bold;">{{ i + 1 }}</el-col>
              </el-row>
@@ -155,6 +203,9 @@
                  <vueQr :text=str+item.packageBoxId :size="110" :margin="1"></vueQr>
                </el-col>
              </el-row>
              <div style="background-color: blueviolet;height: 80px;">
                        1111
              </div> -->
            </el-card>
          </div>
        </div>
@@ -481,3 +532,37 @@
    },
}
</script>
<style>
.x1111111{
    color: black;
    font-size: 18pt;
    font-family: é»‘体;
    justify-content: center;
    text-align: center;
}
.x1111113{
    border: 1px solid black;
    height: 40px;
}
.x1111117{
    border: 1px solid black;
    height: 40px;
}
.x1111116{
    border: 1px solid black;
    height: 220px;
    width: 450px;
}
.x1111114{
    border: 1px solid black;
    width: 80px;
}
.x1111115{
    border: 1px solid black;
}
.x1111112{
    color: black;
    font-size: 12pt;
    font-family: å®‹ä½“;
}
</style>

 vue.config.js

@@ -4,10 +4,10 @@
 */


// const url = 'http://192.168.2.7:9999'
const url = 'http://192.168.2.7:9999'
// const url = 'https://ztms-mes.chinaztt.cn/'

const url = 'http://localhost:9999'
// const url = 'http://localhost:9999'


const localUrl = 'http://localhost:8089'