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

licp

2024-04-25 79ab38a8bdd0e94c83f1a2e3f8d9a49378993517

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

 src/api/technology/document.js

@@ -285,3 +285,16 @@
    responseType: 'blob'
  })
}


/**
 * 检测标准参数
 * @param query
 */
export function getTestStandardParams(query) {
  return request({
    url: '/mes/document/list',
    method: 'get',
    params: query
  })
}

 src/router/router.js

@@ -8,6 +8,7 @@
//创建路由
const createRouter = () => {
  return new VueRouter({
    mode: 'history',
    scrollBehavior (to, from, savedPosition) {
      if (savedPosition) {
        return savedPosition

 src/views/plan/customerorder/sample-customerorder-form.vue

@@ -34,7 +34,7 @@
              <el-input
                v-model="dataForm.contractNo"
                placeholder=""
                disabled
                
              ></el-input>
            </el-form-item>
          </el-col>

 src/views/quality/teststandard/index.vue

@@ -869,13 +869,12 @@
      if (this.testStandardParams.length > 0) {
        for(let standardParam in this.testStandardParams) {
            let value = this.testStandardParams[standardParam].referenceValue
            if( value !== undefined) {
            if( value !=null) {
                value = value.replace(',','，').replace('(','（').replace(')','）')
          } else{
            this.$message.warning('要求范围没有填写!')
            this.isSubmit = false
            return;
          }
                if (!isNaN(value)) {
                  value='='+value
                }
            }
        }
        addTestStandardParam(this.testStandardParams)
          .then((response) => {