Merge remote-tracking branch 'origin/master'

cuilei

昨天 1b8399357869093ce21b285a921525651c46b2c3

 src/views/cms/modules/CuttingInboundModal.vue

@@ -26,7 +26,8 @@
        <a-row style="width: 100%">
          <a-col :span="24">
            <a-form-item label="入库说明" :labelCol="{span:3}" :wrapperCol="{span:21}">
              <a-textarea :disabled="disableSubmit" placeholder="请输入入库说明" v-decorator="['receiveComment', validatorRules.receiveComment]" />
              <a-textarea :disabled="disableSubmit" placeholder="请输入入库说明"
                          v-decorator="['receiveComment', validatorRules.receiveComment]" />
            </a-form-item>
          </a-col>
        </a-row>
@@ -54,7 +55,8 @@
        <a-row style="width: 100%">
          <a-col :span="24">
            <a-form-item label="确认意见" :labelCol="{span:3}" :wrapperCol="{span:21}">
              <a-textarea :disabled="disableSubmit" placeholder="请输入确认意见" v-decorator="['confirmComment', validatorRules.confirmComment]" />
              <a-textarea :disabled="disableSubmit" placeholder="请输入确认意见"
                          v-decorator="['confirmComment', validatorRules.confirmComment]" />
            </a-form-item>
          </a-col>
        </a-row>
@@ -112,6 +114,7 @@
  import JMultiSelectTag from '@/components/dict/JMultiSelectTag'
  import { filterObj } from '@/utils/util'
  import store from '@/store/'

  export default {
    name: 'CuttingInboundModal',
    components: {
@@ -119,7 +122,7 @@
    JMultiSelectTag,
    JDictSelectTag,
    store,
    moment,
    moment
  },
    data () {
      return {
@@ -133,7 +136,7 @@
        },
        showQuickJumper: true,
        showSizeChanger: true,
        total: 0,
        total: 0
      },
      title:'新增',
         visible: false,
@@ -141,19 +144,18 @@
      model: {},
      labelCol: {
        xs: { span: 24 },
        sm: { span: 6 },
        sm: { span: 6 }
      },
      wrapperCol: {
        xs: { span: 24 },
        sm: { span: 18 },
        sm: { span: 18 }
      },
      confirmLoading: false,
      loading: false,
      form: this.$form.createForm(this),
      dataSource: [],
      param: {},
      validatorRules: {
      },
      validatorRules: {},
      columns: [
        {
          title: '#',
@@ -163,35 +165,35 @@
          align: 'center',
          customRender: function (t, r, index) {
            return parseInt(index) + 1
          },
          }
        },
        {
          title: '刀具编码',
          align: 'center',
          dataIndex: 'cuttingCode',
          width: 150,
          width: 150
        },
        {
          title: '刀具名称',
          align: 'center',
          dataIndex: 'cuttingName',
          dataIndex: 'cuttingName'
        },
        {
          title: '入库数量',
          align: 'center',
          dataIndex: 'receiveNumber',
          scopedSlots: { customRender: 'receiveNumber' },
          scopedSlots: { customRender: 'receiveNumber' }
        },
        {
          title: '操作',
          dataIndex: 'action',
          align: 'center',
          scopedSlots: { customRender: 'action' },
        },
          scopedSlots: { customRender: 'action' }
        }
      ],
      url: {
        add: '/cms/cuttingInbound/add',
        detailList: '/cms/cuttingInbound/detailList',
        detailList: '/cms/cuttingInbound/detailList'
      },
      orderId:'',
      disableSubmit:false
@@ -303,7 +305,7 @@
      this.dataSource = []
      this.visible = false
      this.disableSubmit = false
    },
    }
    },
    mounted() {
    this.$bus.$on('selectionRows', (data) => {
@@ -316,6 +318,6 @@
        })
      }
    })
  },
  }
  }
</script>