|
|
@@ -83,10 +83,9 @@
|
|
|
</el-button>
|
|
|
<el-button icon="el-icon-delete" :size="size" :disabled="editDisabled" :type="type" @click="rowDelBox(row, index)">删除 </el-button>
|
|
|
</template>
|
|
|
- <!-- <template slot-scope="{ row }" slot="dot">
|
|
|
+ <template slot-scope="{ row }" slot="dot">
|
|
|
<dic-select
|
|
|
v-if="row.$cellEdit"
|
|
|
- :key="row.dotList"
|
|
|
v-model="row.dot"
|
|
|
placeholder="批次号"
|
|
|
label="dot"
|
|
|
@@ -95,7 +94,7 @@
|
|
|
:filterable="true"
|
|
|
></dic-select>
|
|
|
<span v-else>{{ row.dot }}</span>
|
|
|
- </template> -->
|
|
|
+ </template>
|
|
|
</avue-crud>
|
|
|
</el-tab-pane>
|
|
|
<el-tab-pane label="订单信息" name="payment_details">
|
|
|
@@ -422,14 +421,16 @@ export default {
|
|
|
{
|
|
|
label: "批次号",
|
|
|
prop: "dot",
|
|
|
- cell: true,
|
|
|
- type: "select",
|
|
|
- disabled: true,
|
|
|
- dicData: [],
|
|
|
- props: {
|
|
|
- label: "dot",
|
|
|
- value: "dot"
|
|
|
- }
|
|
|
+ width: 100,
|
|
|
+ overHidden: true
|
|
|
+ // cell: true,
|
|
|
+ // type: "select",
|
|
|
+ // disabled: true,
|
|
|
+ // dicData: [],
|
|
|
+ // props: {
|
|
|
+ // label: "dot",
|
|
|
+ // value: "dot"
|
|
|
+ // }
|
|
|
// dicUrl: "/api/blade-sales-part/stockDesc/dotList"
|
|
|
},
|
|
|
{
|
|
|
@@ -659,27 +660,27 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
rowEdit(row, index) {
|
|
|
- if (this.form.statusName == "待出库") {
|
|
|
- this.optionContacts.column.forEach(its => {
|
|
|
- if (its.prop == "dot") {
|
|
|
- this.$set(its, "disabled", false);
|
|
|
- }
|
|
|
- });
|
|
|
- }
|
|
|
- dotList({
|
|
|
- storageId: this.form.storageId,
|
|
|
- goodsId: row.goodsId
|
|
|
- }).then(res => {
|
|
|
- this.findObject(this.optionContacts.column, "dot").dicData = res.data.data;
|
|
|
- // 增加监听数据改变更改库存数量
|
|
|
- this.findObject(this.optionContacts.column, "dot").change = data => {
|
|
|
- for (let item of data.column.dicData) {
|
|
|
- if (item.dot == data.value) {
|
|
|
- this.$set(row, "inventory", item.balanceQuantity);
|
|
|
- }
|
|
|
- }
|
|
|
- };
|
|
|
- });
|
|
|
+ // if (this.form.statusName == "待出库") {
|
|
|
+ // this.optionContacts.column.forEach(its => {
|
|
|
+ // if (its.prop == "dot") {
|
|
|
+ // this.$set(its, "disabled", false);
|
|
|
+ // }
|
|
|
+ // });
|
|
|
+ // }
|
|
|
+ // dotList({
|
|
|
+ // storageId: this.form.storageId,
|
|
|
+ // goodsId: row.goodsId
|
|
|
+ // }).then(res => {
|
|
|
+ // this.findObject(this.optionContacts.column, "dot").dicData = res.data.data;
|
|
|
+ // // 增加监听数据改变更改库存数量
|
|
|
+ // this.findObject(this.optionContacts.column, "dot").change = data => {
|
|
|
+ // for (let item of data.column.dicData) {
|
|
|
+ // if (item.dot == data.value) {
|
|
|
+ // this.$set(row, "inventory", item.balanceQuantity);
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // };
|
|
|
+ // });
|
|
|
if (row.$cellEdit) {
|
|
|
this.$set(row, "$cellEdit", false);
|
|
|
} else {
|
|
|
@@ -815,17 +816,17 @@ export default {
|
|
|
this.editDisabled = false;
|
|
|
this.optionForm.disabled = false;
|
|
|
}
|
|
|
- // res.data.data.shipItemsList.forEach(row => {
|
|
|
- // row.dotList = [];
|
|
|
- // if (row.dots) {
|
|
|
- // let list = row.dots.split(",");
|
|
|
- // for (let item of list) {
|
|
|
- // row.dotList.push({
|
|
|
- // dot: item
|
|
|
- // });
|
|
|
- // }
|
|
|
- // }
|
|
|
- // });
|
|
|
+ res.data.data.shipItemsList.forEach(row => {
|
|
|
+ row.dotList = [];
|
|
|
+ if (row.dots) {
|
|
|
+ let list = row.dots.split(",");
|
|
|
+ for (let item of list) {
|
|
|
+ row.dotList.push({
|
|
|
+ dot: item
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
this.form = res.data.data;
|
|
|
this.filesList = res.data.data.filesList;
|
|
|
this.$nextTick(() => {
|