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

zouyu

2024-01-04 1ecd9476b211106fde42f3089e7519722f2aa524

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

 src/views/equipment/equipment/index.vue

@@ -147,7 +147,7 @@
            label: '位置',
            sort: true,
            isTrue: true,
            isSearch: false,
            isSearch: true,
            searchInfoType: 'text'
          },
          // 邮箱
@@ -167,7 +167,7 @@
            label: '供应商',
            sort: true,
            isTrue: true,
            isSearch: false,
            isSearch: true,
            searchInfoType: 'text'
          },
          // 制造商
@@ -177,7 +177,7 @@
            label: '制造商',
            sort: true,
            isTrue: true,
            isSearch: false,
            isSearch: true,
            searchInfoType: 'text'
          },
          // 型号规格
@@ -187,7 +187,7 @@
            label: '型号规格',
            sort: true,
            isTrue: true,
            isSearch: false,
            isSearch: true,
            searchInfoType: 'text'
          },
          // 制造日期

 src/views/plan/manufacturingorder/productorder-form.vue

@@ -79,7 +79,7 @@
            </el-col>
          </el-row>
          <el-row :gutter="10">
            <el-col :span="3">
            <el-col :span="4">
              <el-form-item label="需求数量" prop="qtyRequired">
                <el-input
                  v-model="dataForm.qtyRequired"
@@ -88,7 +88,7 @@
                ></el-input>
              </el-form-item>
            </el-col>
            <el-col :span="3">
            <el-col :span="4">
              <el-form-item label="完成数量" prop="qtyFinished">
                <el-input-number
                  style= "width: 90%"
@@ -128,12 +128,15 @@
                ></el-input>
              </el-form-item>
            </el-col> -->
             <el-col :span="6">
             <el-col :span="5">
              <el-form-item label="备注" prop="remark">
                <el-input v-model="dataForm.remark" placeholder=""></el-input>
                <el-tooltip class="item" effect="dark" :content="dataForm.remark">
                <el-input v-model="dataForm.remark" placeholder="">
                </el-input>
                </el-tooltip>
              </el-form-item>
            </el-col>
            <el-col :span="6">
            <el-col :span="5">
              <el-form-item label="制造属性" prop="manufactureAttr">
                <el-select
                  v-model="dataForm.manufactureAttr"
@@ -206,7 +209,7 @@
                </el-switch>
              </el-form-item>
            </el-col> -->
         

        </div>
        <div class="productorder-detail">
          <el-card class="productorder-list">

 src/views/quality/finishedProductInspection/finishedProduct-form.vue

@@ -182,7 +182,7 @@
                                            class="item" effect="dark" content="请先选择设备！" placement="top-start">
                                            <el-input :disabled="scope.row.eId == null"
                                                v-model="scope.row.inote"
                                                @blur="changeState(scope.row)" placeholder="请输入检测值"></el-input>
                                                @blur="changeState(scope.row)" placeholder="请输入检验描述"></el-input>
                                            <span v-if="resultVal != null && processInspectVo.id != null"
                                                v-text="scope.row.inote"></span>
                                        </el-tooltip>
@@ -303,7 +303,6 @@
                documentId: null,
                outBatchNo: null,
                locName: null,
                productNo: null,
            },
            inspectionItems: [], // 新增检验项目表格
            inspectionResultForm: [],
@@ -350,7 +349,7 @@
        }
      },
      codeDevice(row,index){
        this.row=row
        this.row=row 
        console.log("row",row);
        this.deviceCode =true
        this.$refs.codeDeviceCompont.openCamera()
@@ -441,7 +440,6 @@
                    this.processInspectVo.documentId = result.documentId
                    this.processInspectVo.outBatchNo = result.outBatchNo
                    this.processInspectVo.locName = result.locName
                    this.processInspectVo.productNo = result.productNo
                    let userList = []
                    result.children.forEach(item=>{
                        item.iid = Math.random()
@@ -628,7 +626,7 @@
                                updateFinishedInsProduct(obj).then(res => {
                                    if (res.data.code == 0) {
                                        this.init()
                                    }
                                    } 
                                })
                            }
                        })

 vue.config.js

@@ -5,9 +5,9 @@


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

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


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