|
|
@@ -477,7 +477,7 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<div v-if="form.applyType == 'SELL'">
|
|
|
- <div v-for="(goodsList, index) in form.goodsList" :key="index">
|
|
|
+ <div v-for="(goodsList, index) in form.goodsList" :key="index" class="shopListWrap">
|
|
|
<el-form-item
|
|
|
:label="'商品名称' + (index + 1)"
|
|
|
:label-width="formLabelWidth"
|
|
|
@@ -488,6 +488,7 @@
|
|
|
]"
|
|
|
>
|
|
|
<el-select
|
|
|
+ v-if="isAdd"
|
|
|
v-model.trim="goodsList.id"
|
|
|
filterable
|
|
|
:disabled="!isAdd"
|
|
|
@@ -501,6 +502,9 @@
|
|
|
:value="item.id"
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
+ <p class="showShop" v-else>
|
|
|
+ <Tooltip :content="goodsList.id | filterShopId" />
|
|
|
+ </p>
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
|
class="setWidth"
|
|
|
@@ -524,14 +528,16 @@
|
|
|
:disabled="!isAdd"
|
|
|
v-if="form.goodsList.length > 1"
|
|
|
circle
|
|
|
+ style="height:40px;"
|
|
|
@click.prevent="removeGoodsList(goodsList)"
|
|
|
></el-button>
|
|
|
<el-button
|
|
|
icon="el-icon-plus"
|
|
|
+ v-if="form.goodsList.length > 1"
|
|
|
:disabled="!isAdd"
|
|
|
@click.prevent="addGoodsList"
|
|
|
circle
|
|
|
- style="margin-left: 5px"
|
|
|
+ style="margin-left: 5px; height:40px;"
|
|
|
></el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -609,6 +615,7 @@ import { getToken } from "@/utils/auth";
|
|
|
import load from "@/utils/loading";
|
|
|
import { orderServerList } from "@/utils/searchArray";
|
|
|
import { Export } from "@/utils/downLoadFile";
|
|
|
+import Tooltip from "@/components/Tooltip/index";
|
|
|
let validAmount = (rule, value, callback) => {
|
|
|
if (!value) {
|
|
|
callback(new Error("请输入商品数量"));
|
|
|
@@ -620,8 +627,9 @@ let validAmount = (rule, value, callback) => {
|
|
|
callback();
|
|
|
}
|
|
|
};
|
|
|
+let that;
|
|
|
export default {
|
|
|
- components: { pagination },
|
|
|
+ components: { pagination,Tooltip },
|
|
|
name: "incomeTwo",
|
|
|
data() {
|
|
|
return {
|
|
|
@@ -714,6 +722,9 @@ export default {
|
|
|
},
|
|
|
};
|
|
|
},
|
|
|
+ created(){
|
|
|
+ that = this
|
|
|
+ },
|
|
|
mounted() {
|
|
|
getEmployeeOrgan().then((res) => {
|
|
|
if (res.code == 200) {
|
|
|
@@ -1176,6 +1187,17 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
},
|
|
|
+ filters: {
|
|
|
+ filterShopId(val) {
|
|
|
+ let str = "";
|
|
|
+ that.shopList.forEach((shop) => {
|
|
|
+ if (shop.id == val) {
|
|
|
+ str = shop.name;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ return str;
|
|
|
+ },
|
|
|
+ },
|
|
|
};
|
|
|
</script>
|
|
|
<style lang="scss" scoped>
|
|
|
@@ -1196,4 +1218,20 @@ export default {
|
|
|
padding: 0 20px;
|
|
|
margin-bottom: 20px;
|
|
|
}
|
|
|
+.showShop {
|
|
|
+ height: 40px;
|
|
|
+ line-height: 40px;
|
|
|
+ width: 150px;
|
|
|
+ background-color: #f5f7fa;
|
|
|
+ border-color: #e4e7ed;
|
|
|
+ color: #c0c4cc;
|
|
|
+ cursor: not-allowed;
|
|
|
+ color: #333;
|
|
|
+ opacity: 1;
|
|
|
+ border-radius: 4px;
|
|
|
+ border: 1px solid #dcdfe6;
|
|
|
+ padding: 0 15px;
|
|
|
+ margin-right: 10px;
|
|
|
+}
|
|
|
+.shopListWrap { display: flex; flex-direction: row; justify-content: flex-start;}
|
|
|
</style>
|
mo