|
@@ -222,31 +222,33 @@
|
|
|
></MySelect>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div
|
|
|
- class="option-line"
|
|
|
- v-if="guangtouParam.content.where.drivetype == '电动'"
|
|
|
- >
|
|
|
- <div class="item">
|
|
|
- <div class="label">{{ $t("品牌") }}:</div>
|
|
|
- <MySelect
|
|
|
- @click="
|
|
|
- Search('excelParam', 'actuatorbrand');
|
|
|
- calcTableHieght('excelRef');
|
|
|
- "
|
|
|
- :disabled="!excelParam.content.where.actuatordrivetype"
|
|
|
- :options="actuatorbrand"
|
|
|
- v-model="excelParam.content.where.actuatorbrand"
|
|
|
- ></MySelect>
|
|
|
+ <div v-if="actuatorbrand.length">
|
|
|
+ <div
|
|
|
+ class="option-line"
|
|
|
+ v-if="guangtouParam.content.where.drivetype == '电动'"
|
|
|
+ >
|
|
|
+ <div class="item">
|
|
|
+ <div class="label">{{ $t("品牌") }}:</div>
|
|
|
+ <MySelect
|
|
|
+ @click="
|
|
|
+ Search('excelParam', 'actuatorbrand');
|
|
|
+ calcTableHieght('excelRef');
|
|
|
+ "
|
|
|
+ :disabled="!excelParam.content.where.actuatordrivetype"
|
|
|
+ :options="actuatorbrand"
|
|
|
+ v-model="excelParam.content.where.actuatorbrand"
|
|
|
+ ></MySelect>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
- <div class="option-line" v-else>
|
|
|
- <div class="item">
|
|
|
- <div class="label">{{ $t("品牌") }}:</div>
|
|
|
- <MySelect
|
|
|
- @click="Search('excelParam', 'actuatorbrand')"
|
|
|
- :options="actuatorbrand"
|
|
|
- v-model="excelParam.content.where.actuatorbrand"
|
|
|
- ></MySelect>
|
|
|
+ <div class="option-line" v-else>
|
|
|
+ <div class="item">
|
|
|
+ <div class="label">{{ $t("品牌") }}:</div>
|
|
|
+ <MySelect
|
|
|
+ @click="Search('excelParam', 'actuatorbrand')"
|
|
|
+ :options="actuatorbrand"
|
|
|
+ v-model="excelParam.content.where.actuatorbrand"
|
|
|
+ ></MySelect>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div
|
|
@@ -319,7 +321,6 @@
|
|
|
></MySelect>
|
|
|
</div>
|
|
|
</div>
|
|
|
-
|
|
|
<div
|
|
|
class="option-line"
|
|
|
v-show="guangtouParam.content.where.drivetype == '气动'"
|
|
@@ -382,9 +383,8 @@
|
|
|
size="mini"
|
|
|
@click="selectTarget(scope.data, '执行器')"
|
|
|
:disabled="
|
|
|
- loading ||
|
|
|
- (guangtouParam.content.where.drivetype == '电动' &&
|
|
|
- resultArr.length == 2)
|
|
|
+ guangtouParam.content.where.drivetype == '电动' &&
|
|
|
+ resultArr.length == 2
|
|
|
"
|
|
|
>{{ $t("选择") }}</el-button
|
|
|
>
|
|
@@ -421,9 +421,8 @@
|
|
|
size="mini"
|
|
|
@click="selectTarget(scope.data, '执行器')"
|
|
|
:disabled="
|
|
|
- loading ||
|
|
|
- (guangtouParam.content.where.drivetype == '电动' &&
|
|
|
- resultArr.length == 2)
|
|
|
+ guangtouParam.content.where.drivetype == '电动' &&
|
|
|
+ resultArr.length == 2
|
|
|
"
|
|
|
>{{ $t("选择") }}</el-button
|
|
|
>
|
|
@@ -535,7 +534,9 @@
|
|
|
guangtouParam.content.where.drivetype == "电动" &&
|
|
|
resultArr[1] &&
|
|
|
resultArr[1].gearboxname
|
|
|
- ? ` + ${$t('减速箱')}:${resultArr[1] && resultArr[1].gearboxname}`
|
|
|
+ ? ` + ${$t("减速箱")}:${
|
|
|
+ resultArr[1] && resultArr[1].gearboxname
|
|
|
+ }`
|
|
|
: ""
|
|
|
}}</span
|
|
|
>
|
|
@@ -721,14 +722,18 @@
|
|
|
</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
- <td class="title">{{ $t(product.itemno ? "牌价" : "最低经销价") }}</td>
|
|
|
+ <td class="title">
|
|
|
+ {{ $t(product.itemno ? "牌价" : "最低经销价") }}
|
|
|
+ </td>
|
|
|
<td class="text2">
|
|
|
¥{{
|
|
|
Object.keys(product).length
|
|
|
? tool.formatAmount(product.price, 2)
|
|
|
: "xxxxxx"
|
|
|
}}
|
|
|
- <div style="color:#1C1919;font-weight: normal;font-size: 12px;">*{{$t('非标准产品,当前价格仅供参考')}}!</div>
|
|
|
+ <div style="color: #1c1919; font-weight: normal; font-size: 12px">
|
|
|
+ *{{ $t("非标准产品,当前价格仅供参考") }}!
|
|
|
+ </div>
|
|
|
</td>
|
|
|
</tr>
|
|
|
</table>
|
|
@@ -755,7 +760,9 @@
|
|
|
@click="onSubmit"
|
|
|
class="normal-btn-width"
|
|
|
v-if="active == 4"
|
|
|
- >{{ $t(position == "单独选型" ? "保存选型单" : "确认添加") }}</el-button
|
|
|
+ >{{
|
|
|
+ $t(position == "单独选型" ? "保存选型单" : "确认添加")
|
|
|
+ }}</el-button
|
|
|
>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -984,7 +991,8 @@ export default {
|
|
|
whereKeys[i].indexOf("maxrounddiameter") != -1 ||
|
|
|
whereKeys[i].indexOf("maxsquarewidth") != -1 ||
|
|
|
whereKeys[i].indexOf("torque") != -1 ||
|
|
|
- whereKeys[i].indexOf("drivetype") != -1 || whereKeys[i].indexOf('caliber') != -1
|
|
|
+ whereKeys[i].indexOf("drivetype") != -1 ||
|
|
|
+ whereKeys[i].indexOf("caliber") != -1
|
|
|
)
|
|
|
continue;
|
|
|
this[type].content.where[whereKeys[i]] = "";
|
|
@@ -1144,11 +1152,17 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
async onSubmit() {
|
|
|
- this.$confirm(this.$t(this.position == '单独选型' ? '是否确认保存':"确认加入单据吗") + "?", this.$t("提示"), {
|
|
|
- confirmButtonText: this.$t("确定"),
|
|
|
- cancelButtonText: this.$t("取消"),
|
|
|
- type: "warning",
|
|
|
- })
|
|
|
+ this.$confirm(
|
|
|
+ this.$t(
|
|
|
+ this.position == "单独选型" ? "是否确认保存" : "确认加入单据吗"
|
|
|
+ ) + "?",
|
|
|
+ this.$t("提示"),
|
|
|
+ {
|
|
|
+ confirmButtonText: this.$t("确定"),
|
|
|
+ cancelButtonText: this.$t("取消"),
|
|
|
+ type: "warning",
|
|
|
+ }
|
|
|
+ )
|
|
|
.then(async () => {
|
|
|
let mainvalve = Object.keys(this.guangtouParam.content.where)
|
|
|
.filter((v) => v.indexOf("condition") == -1)
|
|
@@ -1202,6 +1216,7 @@ export default {
|
|
|
this.excelParam.content.where.flh = data.flh;
|
|
|
this.excelParam.content.where.maxsquarewidth = data.maxsquarewidth;
|
|
|
this.excelParam.content.where.maxrounddiameter = data.maxrounddiameter;
|
|
|
+ this.actuatorbrand = [];
|
|
|
if (this.guangtouParam.content.where.drivetype == "电动") {
|
|
|
this.excelParam.content.where.caliber = this.resultArr[0].caliber;
|
|
|
}
|