diff --git a/hb_client/src/views/inm/product.vue b/hb_client/src/views/inm/product.vue
index fed1966..9a5d629 100644
--- a/hb_client/src/views/inm/product.vue
+++ b/hb_client/src/views/inm/product.vue
@@ -13,7 +13,7 @@
stripe
highlight-current-row
height="100"
- v-el-height-adaptive-table="{ bottomOffset: 42 }"
+ v-el-height-adaptive-table="{bottomOffset: 42}"
>
@@ -257,7 +257,7 @@ export default {
_this.mtmId.push(item.material_.id);
_this.materialshow.push(item);
});
- this.ordershow = _this.materialshow[0].to_order_.number;
+ this.ordershow = _this.materialshow[0].order_.number;
this.customershow=_this.materialshow[0].order_.customer_.name;
this.contractshow=_this.materialshow[0].order_.contract_.name;
getOrderList({ page: 0, material: _this.mtmId[0], tag:'not_done' }).then(
diff --git a/hb_client/src/views/mtm/productprocess.vue b/hb_client/src/views/mtm/productprocess.vue
index 5c7811f..0dc8172 100644
--- a/hb_client/src/views/mtm/productprocess.vue
+++ b/hb_client/src/views/mtm/productprocess.vue
@@ -622,7 +622,7 @@
:headers="upHeaders"
:file-list="fileList"
:limit="1"
- accept=".doc,.docx,.xls,.xlsx,.ppt,.pptx"
+ accept=".doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf"
>
上传文件
diff --git a/hb_client/src/views/wpm/operationdo.vue b/hb_client/src/views/wpm/operationdo.vue
index 6aae57c..a24d1a3 100644
--- a/hb_client/src/views/wpm/operationdo.vue
+++ b/hb_client/src/views/wpm/operationdo.vue
@@ -63,9 +63,17 @@
:visible.sync="drawer"
direction="rtl"
size="70%">
-
+
+
+
+
+
@@ -743,7 +751,7 @@ export default {
tprogressData: [],
tool:"",
wordText: "",
-
+ pdf:"",
};
},
computed: {},
@@ -765,12 +773,15 @@ export default {
checkPermission,
//作业指导书
-
- getWordText() {
- this.drawer=true;
- const xhr = new XMLHttpRequest();
+//选项卡切换
+ handleClick(tab) {
+
+ var str = tab.label.substr(tab.label.length-1,1);
+ if(str=='x')
+ {
+ const xhr = new XMLHttpRequest();
- xhr.open("get", this.techdocList, true);
+ xhr.open("get",tab.name, true);
xhr.responseType = "arraybuffer";
@@ -787,12 +798,30 @@ export default {
}
};
xhr.send();
+ var filediv = document.getElementById('file');
+filediv.innerHTML=' ';
+
+ }
+ else if (str=='f')
+ {
+ this.pdf=tab.name;
+var filediv = document.getElementById('file');
+filediv.innerHTML=' ';
+
+
+ }
+ },
+ getWordText() {
+ this.drawer=true;
+
+
+
},
readbook(){
- gettechdocList({operation:this.id,page:0}).then((response) => {
+ gettechdocList({operation:this.id,page:0,enabled:true}).then((response) => {
if (response.data) {
- this.techdocList= response.data[0].file_.file;
+ this.techdocList= response.data;
console.log( this.techdocList);
}
});