Merge remote-tracking branch 'origin/master'

王震

2023-11-09 d98942fd0d8b9097e5a5ed4e4f2b3161a0174661

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/equipment/metering/metering-form.vue
#	src/views/quality/finishedProductInspection/finishedProduct-form.vue

 .gitignore

@@ -29,3 +29,6 @@
# Lock File
package-lock.json
yarn.lock

# config.js
vue.config.js

 src/views/equipment/metering/metering-form.vue

@@ -24,44 +24,23 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="校准时间" prop="createTime">
                <el-date-picker
                  v-model="dataForm.createTime"
                    align="right"
                  type="date"
                  placeholder="校准时间"
                  :picker-options="pickerOptions">
                </el-date-picker>
              <el-date-picker
      v-model="dataForm.createTime"
      type="datetime"
      placeholder="校准时间">
        </el-date-picker>
         </el-form-item>
      </el-col>
        <el-col :span="12">
            <el-form-item label="到期时间" prop="updateTime">
              <el-date-picker
              v-model="dataForm.updateTime"
              type="datetime"
      placeholder="校准到期时间">
    </el-date-picker>
  </el-form-item>
  </el-col>
  <el-col :span="12">
            <el-form-item label="校准到期时间" prop="updateTime">
                  <el-date-picker
                  v-model="dataForm.updateTime"
                    align="right"
                  type="date"
                  placeholder="校准到期时间"
                  :picker-options="pickerOptions">
                </el-date-picker>
          </el-form-item>
  </el-col>
          <!-- <el-col :span="12">
            <el-form-item label="类型" prop="type">
              <el-select
                v-model="dataForm.type"
                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="createUser">
              <el-input
@@ -79,7 +58,7 @@
              ></el-input>
            </el-form-item>
          </el-col>
         

          <el-col :span="12">
            <el-form-item label="责任部门" prop="responsibleDepartment">
              <el-input
@@ -111,7 +90,7 @@
                placeholder="检定/校准"
              ></el-input>
            </el-form-item>
          </el-col> 
          </el-col>
          <el-col :span="12">
            <el-form-item label="分类" prop="classification">
              <el-input
@@ -119,7 +98,7 @@
                placeholder="分类"
              ></el-input>
            </el-form-item>
          </el-col> 
          </el-col>
          <el-col :span="12">
            <el-form-item label="定点位置" prop="fixedPointPosition">
              <el-input
@@ -127,8 +106,8 @@
                placeholder="定点位置"
              ></el-input>
            </el-form-item>
          </el-col> 
          
          </el-col>



          <!-- <el-col :span="12">
@@ -168,13 +147,10 @@
  export default {
    data() {
      return {
     
        pickerOptions: {
          disabledDate(time) {
            return time.getTime() > Date.now();
          }
        },

          },},
        // options: regionData,
        visible: false,
        dataForm: {
@@ -191,17 +167,22 @@
          manufactureDate: '',
          installDate: '',
          // state: '',
          verification:'',
          inspectionUnit:'',
          specifications:'',
          responsibleDepartment:'',
          // createUser:'',
          classification:'',
           createUser:'',
          status:'',


          updateTime:'',
          createTime:'',
          description: '',
          value1: '',
          certificate:'',
          fixedPointPosition:'',
          code: null,
          // type: null,
          // status: null,
           status: null,
          supplier: null
        },
        dataRule: {
@@ -269,7 +250,7 @@
          }
        })
      },
  

      initFactorySelect() {
        loadFactoryList().then((res) => {
          this.factoryOptions = res.data
@@ -279,11 +260,11 @@
        })
      }
    },
  

    created() {
      this.initFactorySelect()
      this.getEquipmentState()
  

    //   remote('work_shop').then((response) => {
    //     if (response.data.code === 0) {
    //       this.workshopList = response.data.data
@@ -294,4 +275,3 @@
    }
  }
  </script>
  

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

@@ -8,7 +8,7 @@
            <h2 v-else>编辑-产品检验单</h2>
        </div>
        <div class="btn-group header-right">
            <el-button @click="addTestProject" v-if="processInspectVo.id==null">生成检验项目</el-button>
            <el-button @click="addTestProject" type="primary" v-if="processInspectVo.id==null">生成检验项目</el-button>
        </div>
    </div>
    <div class="page-main">
@@ -154,7 +154,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, index)" placeholder="请输入检验描述"></el-input>
                                                @blur="changeState(scope.row, index)" placeholder="请输入检测值"></el-input>
                                            <!-- <el-select style="width: 100%;" @change="changeState(scope.row, index)" :disabled="scope.row.eId == null" v-model="scope.row.inote" placeholder="请选择">
                                                <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
                                                    :value="item.value">
@@ -276,7 +276,7 @@
        this.init()
    },
    methods: {
        

        submitSave(){
            let pro = 0
            this.inspectionItems.forEach(item => {
@@ -390,7 +390,7 @@
            })
        },
        updateDevice(row,index){
            updateDeviceById({deviceId:row.eId,fpid:row.iId}).then(res=>{
            updateDeviceById({equiomentId:row.eId,fpid:row.iId}).then(res=>{
                this.inspectionItems.forEach(obj=>{
                    if(obj.children){
                        obj.children[index-1].inspectionValue = ''
@@ -425,7 +425,7 @@
                    return
                }
                let obj = {
                    deviceId: row.eId,
                    equiomentId: row.eId,
                    fpid: row.iid,
                    inspectionValue: str,
                    note : row.inote

 src/views/quality/finishedProductInspection/index.vue

@@ -236,15 +236,13 @@
            },
            showPrint(row){
                queryById(row.id).then(res=>{
                    console.log(res);
                this.printFormData = res.data.data
                    this.printFormData = res.data.data
                    this.printDialogVisible = true
                }).catch(error=>{
                    console.log(error);
                })
            },
            exportExcel(){
                console.log("============");
                let queryParam=this.$refs.finishedProduct.getQueryParam();
                delete queryParam.criteria
                console.log(queryParam);

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

@@ -400,15 +400,17 @@
            })
        },
        updateDevice(row, index) {
            let rowId=JSON.stringify(row.iid)
            updateDeviceBypppId({ deviceId: row.eId, ppid: row.iid }).then(res => {
                this.inspectionItems.forEach(obj => {
                    console.log(obj);
                    if (obj.children) {
                        obj.children[index - 1].inspectionValue = null
                        obj.children[index - 1].iresult = null
                        obj.children[index - 1].empiricalValueAddss = []
                        obj.children[index-1].inote=''
                    }
                    obj.children.forEach(c=>{
                        if(c.iid==rowId){
                        c.inspectionValue = null
                        c.iresult = null
                        c.empiricalValueAddss = []
                        c.inote=''
                        }
                    })
                })
            }).catch(error => {
                console.log(error)

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

@@ -7,7 +7,7 @@
        <h2 v-else>编辑-原材料检验</h2>
      </div>
      <div class="btn-group header-right">
        <el-button @click="save()" v-if="this.dataForm.id==null">保存</el-button>
        <el-button type="primary" @click="save()" v-if="this.dataForm.id==null">保存</el-button>
      </div>
    </div>
    <div class="page-main">
@@ -358,7 +358,6 @@
      },
      // 确认回调
      selectPart(param, nodePart, index) {
        console.log(param)
        if (typeof param !== 'undefined') {
          this.dataForm.code = param.code
          this.dataForm.name = param.name