s

王震

2023-11-06 c09eeede806fb7ebd47434464fa6acbe3d29c3e3

s

 package.json

@@ -46,7 +46,8 @@
    "vue-quill-editor": "3.0.6",
    "vue-router": "^3.0.2",
    "vuedraggable": "^2.24.3",
    "vuex": "^3.0.1"
    "vuex": "^3.0.1",
    "xlsx-style": "^0.8.13"
  },
  "devDependencies": {
    "@vue/cli-plugin-babel": "~3.8.0",

 src/api/quality/rawMaterial.js

@@ -10,7 +10,7 @@

export function selectDevice() {
  return request({
    url: '/mes/rawInsProduct/selectDevice',
    url: '/mes/qualityFinishedInsProduct/scope',
    method: 'get',
  })
}

 src/views/common/ztt-table.vue

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

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

@@ -110,11 +110,12 @@
                            <template slot-scope="scope">
                                <span v-if="resultVal!=null && processInspectVo.id!=null" v-text="scope.row.ename"></span>
                                <div v-else>
                                    <el-select style="width:100%" v-model="scope.row.eId" 
                                    <el-input  v-model="scope.row.eId"  v-if="scope.row.iname != null" placeholder="请输入设备号"></el-input>
                                    <!-- <el-select style="width:100%" v-model="scope.row.eId" 
                                    v-if="scope.row.iname != null" filterable @change="updateDevice(scope.row,scope.$index)">
                                        <el-option v-for="(item,index) in deviceList" 
                                        :key="index" :value="item.id" :label="item.number +'-'+ item.name"></el-option>
                                    </el-select>
                                    </el-select> -->
                                </div>
                            </template>
                        </el-table-column>
@@ -323,7 +324,8 @@
        },
        getDeviceList(){
            selectDevice(null).then(res=>{
                this.deviceList = res.data.data
                // this.deviceList = res.data.data
                console.log(res);
            })
        },
        updateDevice(row,index){