Sfoglia il codice sorgente

修改 更换类型 不出页面

hongchuangyanfa 2 anni fa
parent
commit
fe14554dea

+ 11 - 8
src/views/exctab/excelmodel/excelmodel.vue

@@ -362,6 +362,7 @@ import { detailExcel, excelType, tabLazytree, getWbsTypeList, wbstree, selectByN
 export default {
   data () {
     return {
+      excelId:'',
       treeNode: {},
       //#region 鼠标
       leftTRee: '',//左侧树ID
@@ -459,6 +460,7 @@ export default {
       }
     },
     async detailExcel (id) {//获取列表信息
+
       const { data: res } = await detailExcel({ id })
       console.log(res);
       if (res.code === 200) {
@@ -498,8 +500,8 @@ export default {
         this.wbsdata = res.data
       }
     },
-    async selectByNodeTable (id, wbsType, projectid) {//wbs树获取表
-      const { data: res } = await selectByNodeTable({ id, wbsType, projectid })
+    async selectByNodeTable (id, wbsType, liunxId,projectid) {//wbs树获取表
+      const { data: res } = await selectByNodeTable({ id, wbsType,liunxId, projectid })
       console.log(res);
       if (res.code === 200) {
         console.log(Array.isArray(res.data));
@@ -602,7 +604,7 @@ export default {
       } catch (error) {
         loading.close();
       }
-      
+
       if(this.$refs.file1){
         this.$refs.file1.clearFiles();
       }
@@ -755,12 +757,13 @@ export default {
       this.tableList = [];
     },
     nodeClickExcel (data) {//wbs树点击事件
-      console.log(data);
+      console.log(this.excelId,"xxxxxxxxx");
+      console.log(this.excelForm.id,"yyyyyyyy");
       this.wbsform.id = data.id
       this.wbsform.wbsType = data.type
       this.wbsform.wbsName = data.deptName
       if (this.tableList == '') {
-        this.selectByNodeTable(data.id, data.type, this.excelForm.wbsId)
+        this.selectByNodeTable(data.id, data.type, this.excelForm.id,this.excelForm.wbsId)
       } else {
         let tag = true
         this.tableList.forEach((val) => {
@@ -770,7 +773,7 @@ export default {
           }
         })
         if (tag) {
-          this.selectByNodeTable(data.id, data.type, this.excelForm.wbsId)
+          this.selectByNodeTable(data.id, data.type,this.excelForm.id, this.excelForm.wbsId)
         }
       }
 
@@ -880,7 +883,7 @@ export default {
       formData.append('file', file.raw)
       formData.append('nodeId', this.from.id)
       //console.log(file.raw)
-  
+
       const loading = this.$loading({
         lock: true,
         text: 'Loading',
@@ -896,7 +899,7 @@ export default {
         })
         loading.close();
       }).catch(() => {
-        loading.close();        
+        loading.close();
       });
 
       this.$refs.file3.clearFiles();

+ 3 - 3
src/views/manager/projectinfo/treeTemplate/dynamicExcel.vue

@@ -37,9 +37,9 @@
           />
         </span>
         <span v-else-if="type.prop==='tab2'"> <electronicSignature :pkeyId1='pkeyId' :htmlData1="htmlData" /> </span>
-        <span v-else-if="type.prop==='tab3'"> <setFormula /> </span>
-        <span v-else-if="type.prop==='tab4'"> <editDefault /> </span>
-        <span v-else-if="type.prop==='tab5'"> <promptSettings /> </span>
+        <span v-else-if="type.prop==='tab3'"> <setFormula :pkeyId1='pkeyId' :htmlData1="htmlData" /> </span>
+        <span v-else-if="type.prop==='tab4'"> <editDefault :pkeyId1='pkeyId' :htmlData1="htmlData" /> </span>
+        <span v-else-if="type.prop==='tab5'"> <promptSettings :pkeyId1='pkeyId' :htmlData1="htmlData" /> </span>
       </div>
     </div>
   </div>

+ 34 - 32
src/views/manager/projectinfo/treeTemplate/template/editDefault.vue

@@ -1,42 +1,44 @@
 <template>
   <div class="editDefault">
-    <el-select
-      v-model="value"
-      clearable
-      placeholder="请选择"
-    >
-      <el-option
-        v-for="item in options"
-        :key="item.value"
-        :label="item.label"
-        :value="item.value"
-      >
-      </el-option>
-    </el-select>
-    <el-input
-      class="martop15"
-      style="width:100%;"
-      type="textarea"
-      :rows="5"
-      placeholder="请输入内容"
-      v-model="textarea"
-    >
-    </el-input>
+    <el-row :span="24">
+      <el-col :span="3.3" style="line-height: 40px">
+        元素坐标:
+      </el-col>
+      <el-col :span="18">
+        <avue-input v-model="htmlData1.name" placeholder="请点解坐标" :disabled='true' ></avue-input>
+      </el-col>
+    </el-row>
 
-    <div class="flexEnd martop20">
+    <el-row :span="24">
+      <el-col :span="3.3" style="line-height: 40px">
+        默认信息:
+      </el-col>
+      <el-col :span="18">
+        <el-input
+          class="martop15"
+          style="width:100%;"
+          type="textarea"
+          :rows="5"
+          placeholder="请输入内容"
+          v-model="textarea"
+        ></el-input>
+      </el-col>
+    </el-row>
+    <el-row style="text-align: center">
+      <el-button type="primary"
+                 size="small"
+                 icon="el-icon-check"
+                 @click="saveType()">保存</el-button> &nbsp;&nbsp;
       <el-button
-        type="info"
-        size="mini"
-      >重置</el-button>
-      <el-button
-        type="info"
-        size="mini"
-      >确定</el-button>
-    </div>
+                 class="el-button el-button--default el-button--small"
+                 icon="el-icon-use"
+                 @click="saveType()">清&nbsp;&nbsp;空</el-button>
+    </el-row>
   </div>
 </template>
 <script>
 export default {
+  props: ['pkeyId1', 'htmlData1'],
   data () {
     return {
       options: [{
@@ -62,4 +64,4 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-</style>
+</style>

+ 36 - 31
src/views/manager/projectinfo/treeTemplate/template/promptSettings.vue

@@ -1,43 +1,48 @@
 <template>
-  <div>
-    <el-select
-      style="width:300px;"
-      v-model="value"
-      placeholder="请选择元素字段"
-    >
-      <el-option
-        v-for="item in options"
-        :key="item.value"
-        :label="item.label"
-        :value="item.value"
-      >
-      </el-option>
-    </el-select>
+  <div class="editDefault">
+    <el-row :span="24">
+      <el-col :span="3.3" style="line-height: 40px">
+        元素坐标:
+      </el-col>
+      <el-col :span="18">
+        <avue-input v-model="htmlData1.name" placeholder="请点解坐标" :disabled='true' ></avue-input>
+      </el-col>
+    </el-row>
 
-    <el-input
-      class="martop25"
-      type="textarea"
-      :rows="6"
-      placeholder="请输入内容"
-      v-model="textarea"
-    >
-    </el-input>
-
-    <div class="flexEnd martop25">
-      <el-button
-        type="info"
-        size="small"
-        v-throttle='2000'
-      >保存设置</el-button>
-    </div>
+    <el-row :span="24">
+      <el-col :span="3.3" style="line-height: 40px">
+        提示信息:
+      </el-col>
+      <el-col :span="18">
+        <el-input
+          class="martop15"
+          style="width:100%;"
+          type="textarea"
+          :rows="5"
+          placeholder="请输入内容"
+          v-model="textarea"
+        ></el-input>
+      </el-col>
+    </el-row>
+    <el-row style="text-align: center">
+      <el-button type="primary"
+                 size="small"
+                 icon="el-icon-circle-plus-outline"
+                 @click="saveType()">保存</el-button> &nbsp;&nbsp;
+      <el-button type="primary"
+                 size="small"
+                 icon="el-icon-circle-plus-outline"
+                 @click="saveType()">清空</el-button>
+    </el-row>
   </div>
 </template>
 <script>
 export default {
+  props: ['pkeyId1', 'htmlData1'],
   data () {
     return {
       options: []
     }
   }
 }
-</script>
+</script>

+ 2 - 1
src/views/manager/projectinfo/treeTemplate/template/setFormula.vue

@@ -48,6 +48,7 @@
 </template>
 <script>
 export default {
+  props: ['pkeyId1', 'htmlData1'],
   daat () {
     return {
       options: [{
@@ -85,4 +86,4 @@ export default {
     }
   }
 }
-</style>
+</style>