|
|
@@ -1100,13 +1100,14 @@
|
|
|
<el-button :disabled="browseStatus" type="primary" size="small">
|
|
|
下载模板
|
|
|
</el-button>
|
|
|
- <el-button size="small" type="primary">导入Execl</el-button>
|
|
|
+ <el-button size="small" type="primary"
|
|
|
+ >导入Execl</el-button
|
|
|
+ >
|
|
|
</el-col>
|
|
|
<el-col style="display: flex; justify-content: flex-end">
|
|
|
<el-button
|
|
|
size="small"
|
|
|
type="info"
|
|
|
- :disabled="browseStatus"
|
|
|
prop="打印"
|
|
|
@click="printZyd"
|
|
|
>作业单
|
|
|
@@ -1745,7 +1746,6 @@
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
size="mini"
|
|
|
- :disabled="browseStatus"
|
|
|
@click="
|
|
|
print_zyd = false;
|
|
|
addprint('zyd');
|
|
|
@@ -1815,7 +1815,6 @@
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
- :disabled="browseStatus"
|
|
|
@click="
|
|
|
addprint('shd');
|
|
|
print_shd = false;
|
|
|
@@ -1938,7 +1937,6 @@
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
- :disabled="browseStatus"
|
|
|
@click="
|
|
|
addprint('rkd');
|
|
|
print_rkd = false;
|
|
|
@@ -2029,7 +2027,6 @@
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
- :disabled="browseStatus"
|
|
|
@click="
|
|
|
addprint('bzrkd');
|
|
|
print_bzrkd = false;
|
|
|
@@ -2117,7 +2114,6 @@
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
- :disabled="browseStatus"
|
|
|
@click="
|
|
|
addprint('bzrkd_js');
|
|
|
print_bzrkd_js = false;
|
|
|
@@ -2229,7 +2225,6 @@
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
- :disabled="browseStatus"
|
|
|
@click="
|
|
|
addprint('lhd');
|
|
|
print_lhd = false;
|
|
|
@@ -2313,7 +2308,6 @@
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
- :disabled="browseStatus"
|
|
|
@click="
|
|
|
addprint('hwqr');
|
|
|
print_hwqr = false;
|
|
|
@@ -2403,7 +2397,6 @@
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
- :disabled="browseStatus"
|
|
|
@click="
|
|
|
addprint('lwqr');
|
|
|
print_lwqr = false;
|
|
|
@@ -2511,7 +2504,6 @@
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
- :disabled="browseStatus"
|
|
|
@click="
|
|
|
addprint('dpxx');
|
|
|
print_dpxx = false;
|
|
|
@@ -3102,7 +3094,6 @@
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
- :disabled="browseStatus"
|
|
|
@click="
|
|
|
addprint('dk');
|
|
|
print_dk = false;
|
|
|
@@ -3137,26 +3128,14 @@
|
|
|
@click="addOrUpdateHand(form, 'f_billstatus')"
|
|
|
>审批</el-button
|
|
|
>
|
|
|
- <el-button
|
|
|
- :disabled="browseStatus"
|
|
|
- type="success"
|
|
|
- prop="打印"
|
|
|
- @click="print_shd = true"
|
|
|
+ <el-button type="success" prop="打印" @click="print_shd = true"
|
|
|
>收货单
|
|
|
</el-button>
|
|
|
- <el-button
|
|
|
- :disabled="browseStatus"
|
|
|
- type="warning"
|
|
|
- prop="打印"
|
|
|
- @click="print_rkd = true"
|
|
|
+ <el-button type="warning" prop="打印" @click="print_rkd = true"
|
|
|
>入库单
|
|
|
</el-button>
|
|
|
<el-button @click="discharge" :disabled="browseStatus">卸货</el-button>
|
|
|
- <el-button
|
|
|
- type="info"
|
|
|
- :disabled="browseStatus"
|
|
|
- prop="打印"
|
|
|
- @click="print_zyd = true"
|
|
|
+ <el-button type="info" prop="打印" @click="print_zyd = true"
|
|
|
>作业单
|
|
|
</el-button>
|
|
|
<el-button :disabled="browseStatus" type="primary" @click="saveForm()"
|
|
|
@@ -3180,6 +3159,10 @@
|
|
|
>
|
|
|
<el-button @click="cancel">取 消</el-button>
|
|
|
</div>
|
|
|
+ <upload-excel
|
|
|
+ ref="upexcel"
|
|
|
+ :uploadExcelVisible="uploadExcel"
|
|
|
+ ></upload-excel>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -3225,8 +3208,7 @@ import draggable from "vuedraggable";
|
|
|
import upLoad from "../components/upLoad";
|
|
|
import incomeMoney from "../components/incomeMoney";
|
|
|
import payMoney from "../components/payMoney";
|
|
|
-// import downloadTemplate from "./downloadTemplate";
|
|
|
-// import uploadExcel from "./uploadExcel";
|
|
|
+import uploadExcel from "./uploadExcel";
|
|
|
export default {
|
|
|
name: "inStock",
|
|
|
props: {
|
|
|
@@ -3248,6 +3230,7 @@ export default {
|
|
|
upLoad,
|
|
|
incomeMoney,
|
|
|
payMoney,
|
|
|
+ uploadExcel,
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
@@ -3584,6 +3567,7 @@ export default {
|
|
|
ifweightRecoveryList: [],
|
|
|
showApproval: null,
|
|
|
downloadTemplateVisible: false,
|
|
|
+ uploadExcel: false,
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
@@ -3846,9 +3830,6 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
},
|
|
|
- tishi() {
|
|
|
- return this.$message.error("正在开发中");
|
|
|
- },
|
|
|
//查询列数据
|
|
|
getRow() {
|
|
|
let that = this;
|
|
|
@@ -5496,6 +5477,7 @@ export default {
|
|
|
this.$set(this.form, "fItemsStatus", 2);
|
|
|
}
|
|
|
});
|
|
|
+
|
|
|
print({
|
|
|
printable: "print_area1",
|
|
|
type: "html",
|
|
|
@@ -5643,7 +5625,19 @@ export default {
|
|
|
this.cancel();
|
|
|
});
|
|
|
},
|
|
|
- downLoad() {},
|
|
|
+ openUploadExcel() {
|
|
|
+ this.uploadExcel = true;
|
|
|
+ this.$refs.upexcel.init(this.form.fWarehouseid);
|
|
|
+ },
|
|
|
+ // 监听 子组件弹窗关闭后触发，有子组件调用
|
|
|
+ showAddOrUpdate(data) {
|
|
|
+ if (data === "false") {
|
|
|
+ this.addOrUpdateVisible = false;
|
|
|
+ this.disabled = false;
|
|
|
+ } else {
|
|
|
+ this.addOrUpdateVisible = true;
|
|
|
+ }
|
|
|
+ },
|
|
|
},
|
|
|
watch: {
|
|
|
// 监听 addOrUpdateVisible 改变
|
qukaidi