Merge remote-tracking branch 'origin/master'

zhaowei

10 天以前 008245cbe95c63a80f9a255378a5ffbe25d15085

 src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue

@@ -3,14 +3,14 @@
           :okButtonProps="{ props: {disabled: disableSubmit} }" @ok="handleOk" @cancel="handleCancel" cancelText="关闭">
    <a-spin :spinning="confirmLoading">
      <a-form :form="form">
        <a-row :gutter="24">
          <a-col :span="24">
            <a-form-item label="设备组" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
              <a-input-search :readOnly="true" v-decorator="['equipmentIds', validatorRules.equipmentIds]"
                              @search="deviceSearch" enter-button/>
            </a-form-item>
          </a-col>
        </a-row>
        <!--<a-row :gutter="24">-->
          <!--<a-col :span="24">-->
            <!--<a-form-item label="设备组" :labelCol="labelColLong" :wrapperCol="wrapperColLong">-->
              <!--<a-input-search :readOnly="true" v-decorator="['equipmentIds', validatorRules.equipmentIds]"-->
                              <!--@search="deviceSearch" enter-button placeholder="请选择设备"/>-->
            <!--</a-form-item>-->
          <!--</a-col>-->
        <!--</a-row>-->
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-item label="零件号" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -31,18 +31,20 @@
          </a-col>
          <a-col :span="12">
            <a-form-item label="时长（分钟）" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input placeholder="请输入时长"  v-decorator="['duration', validatorRules.duration]"></a-input>
              <a-input-number :min="0" placeholder="请输入时长"  v-decorator="['duration', validatorRules.duration]"></a-input-number>
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="24">
          <a-form-item label="备注" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
            <a-textarea   v-decorator="['remark', validatorRules.remark]" placeholder="请输入备注"  ></a-textarea>
            <a-textarea :maxLength="20"  v-decorator="['remark', validatorRules.remark]" placeholder="请输入备注"  ></a-textarea>
          </a-form-item>
          </a-col>
        </a-row>
      </a-form>
    </a-spin>
    <mdc-standard-process-duration-modal-list  ref="deviceRepairListModel" @sendSelectionRows="getDeviceRows"></mdc-standard-process-duration-modal-list>
    <select-device-drawer ref="selectDeviceDrawer" @selectFinished="selectOK" :title="'选择设备'"/>

  </a-modal>
</template>
@@ -50,7 +52,6 @@
<script>
  import moment from 'moment'
  import pick from 'lodash.pick'
  import MdcStandardProcessDurationModalList from './MdcStandardProcessDurationModalList'
  // import JDate from './JDate'
  import {
    getAction,
@@ -60,10 +61,11 @@
  import {
    duplicateCheck
  } from '@/api/api'
  import SelectDeviceDrawer from '../../../../system/modules/SelectDeviceDrawer'

  export default {
    name: 'MdcStandardProcessDurationModal',
    components: {MdcStandardProcessDurationModalList},
    components: { SelectDeviceDrawer },
    props: {},
    data() {
      return {
@@ -116,6 +118,38 @@
              {
                required:true,
                message: "请选择设备"
              },
            ],
          },
          partsCode:{
            rules:[
              {
                required:true,
                message: "请输入零件号"
              },
            ],
          },
          batchCode:{
            rules:[
              {
                required:true,
                message: "请输入批次号"
              },
            ],
          },
          sequenceNumber:{
            rules:[
              {
                required:true,
                message: "请输入程序号"
              },
            ],
          },
          duration:{
            rules:[
              {
                required:true,
                message: "请输入时长"
              },
            ],
          },
@@ -176,9 +210,10 @@
        // })
      },
      deviceSearch() {
        this.$refs.deviceRepairListModel.openPage()
        this.$refs.deviceRepairListModel.title = '选择设备'
        this.$refs.deviceRepairListModel.disableSubmit = false
        this.$refs.selectDeviceDrawer.visible = true
        this.$refs.selectDeviceDrawer.selectedRowKeys = []
        this.$refs.selectDeviceDrawer.selectedRows = []
        this.$refs.selectDeviceDrawer.checkedKeys = this.form.getFieldValue('equipmentIds') ? this.form.getFieldValue('equipmentIds').split(',') : []
      },
      //级联框onChange事件
      // onChange(value) {
@@ -254,11 +289,19 @@
                }
                obj.then((res) => {
                  if (res.success) {
                    that.$message.success("添加成功")
                    // that.$message.success("添加成功")
                    that.$notification.success({
                      message:'消息',
                      description:"添加成功"
                    });
                    // that.$message.success(res.message)
                    that.$emit('ok', res.result)
                  } else {
                    that.$message.warning(res.message)
                    // that.$message.warning(res.message)
                    that.$notification.warning({
                      message:'消息',
                      description:res.message
                    });
                  }
                }).finally(() => {
                  that.confirmLoading = false
@@ -306,12 +349,28 @@
      },
      checkboxChange(e) {
        this.checked = e.target.checked
      },

      /**
       * 选择已有设备后点击确定时触发
       * @param data 已选择的设备
       */
      selectOK(data) {
        // let params = {}
        // params.equipmentIdList = []
        // for (var a = 0; a < data.length; a++) {
        //   params.equipmentIdList.push(data[a])
        // }
        console.log('data=', data)
        this.form.setFieldsValue({
          equipmentIds: data.join(',')
        })
      }
    }
  }
</script>

<style scoped>
<style scoped lang="less">
  .ant-btn {
    padding: 0 10px;
    margin-left: 3px;
@@ -330,4 +389,7 @@
  .ant-tabs-content .ant-form-item {
    margin-bottom: 0px;
  }
  /deep/ .ant-input-number{
    width: 100%!important;
  }
</style>