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

Fixiaobai

2023-12-15 fc6ed7861e7771b16452f8e88a5c67d9b0d9c9c6

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

 src/views/basic/location/index.vue

@@ -194,7 +194,7 @@
            optList: () => {
              return this.getWarehouseLocGroupList()
            }
          },
          }/* ,
          // ERP库位
          {
            minWidth: '200',
@@ -204,7 +204,7 @@
            isTrue: false,
            isSearch: true,
            searchInfoType: 'text'
          }
          } */
        ],
        toolbar: [
          {

 src/views/basic/location/location-form.vue

@@ -134,10 +134,23 @@

      <el-row>
        <el-col :span="12">
          <el-form-item label="创建时间" prop="createTime">
            <el-date-picker
              readonly
              style="width: 100%"
              v-model="moment"
              type="datetime"
              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="IFS库位"
            prop="ifsLocationDesc"
          >
          > -->
            <!-- <el-select
              v-model="dataForm.ifsLocation"
              filterable
@@ -152,13 +165,13 @@
              >
              </el-option>
            </el-select> -->
            <el-cascader
           <!--  <el-cascader
              v-model="dataForm.ifsLocationDesc"
              :props="locationProps"
              style="width:100%" filterable
            ></el-cascader>
          </el-form-item>
        </el-col>
        </el-col> -->
        <el-col :span="12">
          <el-form-item label="库位状态" prop="locStatus">
            <el-switch
@@ -169,7 +182,7 @@
          </el-form-item>
        </el-col>
      </el-row>
      <el-row>
      <!-- <el-row>
        <el-col :span="12">
          <el-form-item label="创建时间" prop="createTime">
            <el-date-picker
@@ -184,7 +197,7 @@
          </el-form-item>
        </el-col>
        <el-col :span="12"> </el-col>
      </el-row>
      </el-row> -->
    </el-form>
    <span slot="footer" class="dialog-footer">
      <el-button @click="visible = false">取消</el-button>

 src/views/common/qrCodeApp.vue

@@ -39,12 +39,10 @@
        },
        //回调扫描结果
        onDecode(result) {
            console.log(result);
            if (result !== "") {
                this.result=result
                this.$emit("ok",this.result)
                this.cancelCode()
                // alert(result)            
            }
        },
        // 相机反转
@@ -75,12 +73,7 @@
        async onInit(promise) {
            try {
                const { capabilities } = await promise;
                console.log(
                    "🚀 ~ file: cameracomponent.vue:47 ~ onInit ~ capabilities",
                    capabilities
                );
            } catch (error) {
                // console.log()
                this.$toast(error.name);
                if (error.name === "NotAllowedError") {
                    this.error = "ERROR: 您需要授予相机访问权限";
@@ -106,12 +99,7 @@
        }
    },
    watch: {
        "result": {
            handler(newVal) {
                console.log('扫描值' + newVal);
            },
            deep: true
        }

    }
};
</script>

 src/views/common/rawMaterial-part.vue

@@ -65,7 +65,6 @@
      return {
        ajaxFun: chooseIFS,
        innerVisible: false,
        listLoading: true,
        currentRow: null,
        multipleSelection: [],
        uploadInfo: {

 src/views/common/ztt-table.vue

@@ -942,8 +942,7 @@
      }
    },
    getDataList(selectedId) {
      // this.dataListLoading = true
      this.dataListLoading = false
      this.dataListLoading = true
      var criteria = {}
      criteria.dateTimeFilters = this.dateTimeFilters
      criteria.multiSearchFilter = this.multiSearchFilter

 src/views/quality/rawMaterial/rawMaterial-form.vue

@@ -28,12 +28,7 @@
            </el-col>
              <el-col :span="6">
                <el-form-item label="零件号" prop="code">
                <el-input v-model="dataForm.code" :disabled="resultVal!=null && dataForm.id!=null">
                  <!-- <el-button
                    slot="append"
                    icon="el-icon-search"
                    :disabled="resultVal!=null && dataForm.id!=null"
                    @click="queryCode()"></el-button> -->
                <el-input v-model="dataForm.code" disabled>
                    <el-button
                    slot="append"
                    icon="el-icon-full-screen"
@@ -44,8 +39,9 @@
            </el-col>
            <el-col :span="6">
                <el-form-item prop="name" label="原材料名称">
                <el-input v-model="dataForm.name" disabled >
                </el-input>
                  <el-tooltip class="item" effect="dark" :content="dataForm.name">
                  <el-input v-model="dataForm.name" disabled ></el-input>
                </el-tooltip>
                </el-form-item>
            </el-col>
            <el-col :span="6">
@@ -63,7 +59,9 @@
            <el-row>
              <el-col :span="6">
                <el-form-item label="规格型号" prop="specs">
                <el-input v-model="dataForm.specs" disabled></el-input>
                  <el-tooltip class="item" effect="dark" :content="dataForm.specs">
                    <el-input v-model="dataForm.specs" disabled></el-input>
                  </el-tooltip>
                </el-form-item>
              </el-col>
                <el-col :span="6">
@@ -76,7 +74,9 @@
                </el-col>
                <el-col :span="6">
                    <el-form-item label="供应商名称" prop="supplier">
                      <el-tooltip class="item" effect="dark" :content="dataForm.supplier" >
                        <el-input v-model="dataForm.supplier" disabled />
                      </el-tooltip>
                    </el-form-item>
                </el-col>
                <el-col :span="6">
@@ -342,7 +342,7 @@
                formTime: '',
                message: '',
                name: '',
                code: '88.118.1/A0498220',
                code: '',
                specs: '',
                unit: '',
                number: '',
@@ -428,72 +428,9 @@
      },
       // 打开相机
      Turnonthecamera() {
        console.log("执行");
        this.qrcode = true
        this.$refs.codeCompont.openCamera()
      // this.camera = 'rear'
    },
    // 扫码结果回调
    // onDecode(result) {
    //   console.log(result)
    //   this.turnCameraOff()
    // },
    // 相机反转
    // switchCamera() {
    //   switch (this.camera) {
    //     case 'front':
    //       this.camera = 'rear'
    //       break
    //     case 'rear':
    //       this.camera = 'front'
    //       break
    //     default:
    //       this.$toast('错误')
    //   }
    // },
    // 关闭相机
    // turnCameraOff() {
    //   this.camera = 'off'
    //   this.qrcode = false
    // },
    // 打开手电筒
    // ClickFlash() {
    //   switch (this.torchActive) {
    //     case true:
    //       this.torchActive = false
    //       break
    //     case false:
    //       this.torchActive = true
    //       break
    //     default:
    //       this.$toast('错误')
    //   }
    // },

    // 检查是否调用摄像头
    // async onInit(promise) {
    //   try {
    //     await promise
    //   } catch (error) {
    //     if (error.name === 'StreamApiNotSupportedError') {
    //     } else if (error.name === 'NotAllowedError') {
    //       this.errorMessage = 'Hey! I need access to your camera'
    //     } else if (error.name === 'NotFoundError') {
    //       this.errorMessage = 'Do you even have a camera on your device?'
    //     } else if (error.name === 'NotSupportedError') {
    //       this.errorMessage =
    //         'Seems like this page is served in non-secure context (HTTPS, localhost or file://)'
    //     } else if (error.name === 'NotReadableError') {
    //       this.errorMessage =
    //         "Couldn't access your camera. Is it already in use?"
    //     } else if (error.name === 'OverconstrainedError') {
    //       this.errorMessage =
    //         "Constraints don't match any installed camera. Did you asked for the front camera although there is none?"
    //     } else {
    //       this.errorMessage = 'UNKNOWN ERROR: ' + error.message
    //     }
    //   }
    // },
      // 确认回调
      selectPart(param, nodePart, index) {
        if (typeof param !== 'undefined') {
@@ -759,7 +696,6 @@
            for(var i=0;i<row.testValueList.length;i++){
              let val = row.testValueList[i]
              let reg = /^[0-9]*[1-9][0-9]*$/
              console.log(['是','否'].includes(val));
              if(!reg.test(val) && !['是','否'].includes(val)){
                this.$message.error("请输入数字或选择是否")
                row.testValueList[i] = null