Merge remote-tracking branch 'origin/master'

admin

2024-01-08 f1836e2107bdb13687dddb94de72b91efb49a393

 jcdm-ui/src/views/main/em/equipmentArchives/index.vue

@@ -157,19 +157,6 @@
            </el-option>
          </el-select>
        </el-form-item>
<!--        <el-form-item label="产线编码" prop="lineCode">-->
<!--          <el-input v-model="form.lineCode" placeholder="请输入产线编码" />-->
<!--        </el-form-item>-->
<!--        <el-form-item label="产线编码" prop="lineCode">-->
<!--          <el-select style="width: 100%" @change="handleSelectChangelineCode(form.processesCode)" v-model="form.lineCode" placeholder="请输入产线编码">-->
<!--            <el-option-->
<!--              v-for="item in options"-->
<!--              :key="item.lineCode"-->
<!--              :label="item.lineCode"-->
<!--              :value="item.lineCode">-->
<!--            </el-option>-->
<!--          </el-select>-->
<!--        </el-form-item>-->
        <el-form-item label="备注" prop="remark">
          <el-input v-model="form.remark" placeholder="请输入备注" />
        </el-form-item>
@@ -273,12 +260,15 @@
    // 在这里编写处理选中事件的逻辑
    handleSelectChange(selectedOption) {
      this.form.lineCode = null;
      listLineInfo(selectedOption).then(response => {
      let param = {
        workshopCode : selectedOption
      }
      listLineInfo(param).then(response => {
        this.lineOptions = response.rows;
      });
    },
    getList() {
      this.$modal.msgSuccess("修改成功");
      // this.$modal.msgSuccess("修改成功");
      console.log(this.queryParams)
      this.loading = true;
      listEquipmentArchives(this.queryParams).then(response => {