Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

 src/views/mdc/base/modules/EquipmentList/UserModal.vue

@@ -1,12 +1,11 @@
<template>
  <a-drawer
  <a-modal
    :title="title"
    :maskClosable="true"
    :width="drawerWidth"
    placement="right"
    :closable="true"
    @close="handleCancel"
    @cancel="visible=false"
    :visible="visible"
    :footer="null"
    style="height: 100%;overflow: auto;padding-bottom: 53px;">

    <template slot="title">
@@ -26,7 +25,7 @@
            <a-form-model-item label="设备编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId">
              <a-input-search :readOnly="true"
                              v-model="model.equipmentId"
                              :disabled="disSeach"   @search="deviceSearch" enter-button placeholder='请选择设备编码'/>
                              :disabled="disSeach"   @search="deviceSearch" enter-button placeholder='请选择设备编码' />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
@@ -56,9 +55,6 @@
          <a-col :span="12">
            <a-form-model-item label="车间分配" :labelCol="labelCol" :wrapperCol="wrapperCol"  v-show="!productionDisabled" ref="selectedProduction"  prop="selectedProduction">
              <!--<j-select-equipment-production  v-decorator="['selectedProduction',{rules:[{required:true,message:'请选择车间!'}]}]" :multi="false" @back="backProductionInfo" :backProduction="true" :treeProductOpera="true"></j-select-equipment-production>-->



              <j-select-equipment-production :disabled="disableSubmit"  v-model="model.selectedProduction" :multi="false" @back="backProductionInfo" :backProduction="true" :treeProductOpera="true"></j-select-equipment-production>
            </a-form-model-item>

@@ -148,13 +144,13 @@


    <div class="drawer-bootom-button" v-show="!disableSubmit">
      <a-popconfirm title="确定放弃编辑？" @confirm="handleCancel" okText="确定" cancelText="取消">
      <a-popconfirm title="确定放弃操作？" @confirm="close" okText="确定" cancelText="取消">
        <a-button style="margin-right: .8rem">取消</a-button>
      </a-popconfirm>
      <a-button @click="handleSubmit" type="primary" :loading="confirmLoading">提交</a-button>
    </div>
    <device-list-model ref="deviceListModel" @sendSelectionRows="getDeviceRows"></device-list-model>
  </a-drawer>
  </a-modal>

</template>

@@ -203,7 +199,7 @@
          equipmentId:
            [
              {
              required: true, message: '请选择设备编号!',
              required: true, message: '请选择设备编号!'
              },
              // {
              // validator: this.validatequipmentId
@@ -349,6 +345,7 @@
        that.visible = true;
        //根据屏幕宽度自适应抽屉宽度
        this.resetScreenSize();

        // that.userId = record.id;
        // console.log(record)
        that.model = Object.assign({}, record);
@@ -451,8 +448,6 @@
        })
      },



      refresh () {
        this.userId=""
        this.nextDepartOptions=[];
@@ -551,11 +546,6 @@
      //     }
      //   })
      // },
      handleCancel () {
        this.close()
      },



      // validatequipmentId(rule, value, callback){
      //   if(!value){
@@ -589,8 +579,15 @@
        }else{
          this.departIdShow=true;
        }
      },
      /**
       * 编辑或查看详情数据时清除抽屉表单验证
       */
      removeValidate(){
        this.$refs.form.clearValidate()
      }
    }
    },

  }
</script>