iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsControlRuleDetail/index.vue
@@ -202,14 +202,14 @@ customHeaderCell: () => { return { style: { 'min-width': '120px'//最小列宽设置 'min-width': '150px'//最小列宽设置 } } }, customCell: () => { return { style: { 'min-width': '120px'//最小列宽设置 'min-width': '150px'//最小列宽设置 } } }, @@ -222,14 +222,14 @@ customHeaderCell: () => { return { style: { 'min-width': '120px'//最小列宽设置 'min-width': '150px'//最小列宽设置 } } }, customCell: () => { return { style: { 'min-width': '120px'//最小列宽设置 'min-width': '150px'//最小列宽设置 } } }, iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -1,5 +1,5 @@ <template> <a-modal :title="title" :width="1200" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit" <a-modal :title="title" :width="1300" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit" @cancel="handleCancel"> <a-spin :spinning="confirmLoading"> <!-- tab --> iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/addForm.vue
@@ -5,6 +5,9 @@ <a-form-item label="控制属性规则" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback> <a-input disabled placeholder="请输入控制属性规则编号" v-decorator="['ruleCode', {rules: [{required: true, message: '请输入控制属性规则编号！'}]}]" /> </a-form-item> <a-form-item label="控制属性规则名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback> <a-input disabled placeholder="请输入控制属性规则名称" v-decorator="['ruleName', {rules: [{required: true, message: '请输入控制属性规则名称！'}]}]" /> </a-form-item> <a-form-item label="最高库存" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback> <a-input disabled placeholder="请输入最高库存" v-decorator="['maxImumqty']" /> </a-form-item> iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsControlRule/index.vue
@@ -66,7 +66,7 @@ </a-form-item> </a-col> </template> <a-col :md="8" :sm="24"> <span class="table-page-search-submitButtons"> <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button> @@ -84,7 +84,7 @@ </div> <a-card :bordered="false"> <s-table ref="table" :columns="columns" :data="loadData" :alert="true" @changeTablePage="pageInfo = $event" :scroll="{ x: true}" :rowKey="record => record.id" :scroll="{ x: true }" :rowKey="record => record.id" :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"> <template class="table-operator" slot="operator" v-if="hasPerm('WmsControlRule:add')"> <!-- <div ref="actionBar" class="actionBar"> @@ -109,22 +109,31 @@ > </div> --> </template> <span slot="isDisabledscopedSlots" slot-scope="text"> <div v-if="text === true"> <a-tag color="green">是</a-tag> </div> <div v-else-if="text == false"> <a-tag color="volcano">否</a-tag> </div> <div v-else=""></div> </span> <span slot="isNotChekscopedSlots" slot-scope="text"> <div v-if="text===true "> <a-tag color="green">是</a-tag> </div> <div v-else-if="text==false"> <a-tag color="volcano">否</a-tag> </div> <div v-else=""></div> </span> <span slot="isDisabledscopedSlots" slot-scope="text"> <div v-if="text===true "> <a-tag color="green">是</a-tag> </div> <div v-else-if="text==false"> <a-tag color="volcano">否</a-tag> </div> <div v-else=""></div> </span> <!-- <span slot="action" slot-scope="text, record"> <a v-if="hasPerm('WmsControlRule:getdetail')" @click="$refs.detailForm.edit(record)">详情</a> </a-popconfirm> </span> --> </s-table> </a-card> </div> </template> @@ -144,7 +153,7 @@ export default { // mixins: [setTableHtMixin], components: { STable, STable }, data() { return { @@ -174,7 +183,7 @@ customCell: () => { return { style: { 'min-width': '120px'//最小列宽设置 'min-width': '150px'//最小列宽设置 } } }, @@ -182,6 +191,26 @@ dataIndex: 'ruleCode' }, { title: '控制属性规则名称', align: 'center', customHeaderCell: () => { return { style: { 'min-width': '150px'//最小列宽设置 } } }, customCell: () => { return { style: { 'min-width': '150px'//最小列宽设置 } } }, sorter: true, dataIndex: 'ruleName' }, { title: '最高库存', align: 'center', customHeaderCell: () => { iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/addFormBaseCustomer.vue
@@ -181,6 +181,22 @@ this.list = param }, handleSubmit() { var selectedRowsArrMy = this.$refs.showList.selectedRows; console.log("3333333") console.log(selectedRowsArrMy) if(this.list.length==0){ this.list = selectedRowsArrMy }else{ var arr1 = [] this.list.forEach(item => { var itemArr = selectedRowsArrMy.filter(v=>v.id != item.id) if(itemArr.length>0){ //arr1.push(itemArr[0]) arr1.concat(itemArr) } }) this.list.concat(arr1) } this.visible = false }, handleCancel() { iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/addFormBaseCustomer/index.vue
@@ -686,7 +686,7 @@ onSelectChange(selectedRowKeys, selectedRows) { this.selectedRowKeys = selectedRowKeys this.selectedRows = selectedRows this.$emit('ok', selectedRows) // this.$emit('ok', selectedRows) } } }
