lucw 9 месяцев назад
Родитель
Сommit
3738e98a6e

+ 3 - 2
src/views/bpm/done/detailDialog.vue

@@ -32,7 +32,7 @@
         :edit="false"
         :edit="false"
         ref="generateForm"
         ref="generateForm"
       >
       >
-              <template v-slot:blank_adopzrdd="scope">
+        <template v-slot:blank_adopzrdd="scope">
           <div v-for="(item, index) in scope.model.blank_adopzrdd" :key="index">
           <div v-for="(item, index) in scope.model.blank_adopzrdd" :key="index">
             <div class="blank_adopzrdd">
             <div class="blank_adopzrdd">
               <span>{{ index + 1 }}报销事项:</span>
               <span>{{ index + 1 }}报销事项:</span>
@@ -111,6 +111,7 @@
 
 
         this.activeComp = 'main';
         this.activeComp = 'main';
         this.visible = true;
         this.visible = true;
+        console.log('this.form.pcViewRouter', this.form.pcViewRouter);
         Vue.component('async-biz-form-component', (resolve) => {
         Vue.component('async-biz-form-component', (resolve) => {
           require([`@/views${this.form.pcViewRouter}`], resolve);
           require([`@/views${this.form.pcViewRouter}`], resolve);
         });
         });
@@ -142,7 +143,7 @@
       font-weight: bold;
       font-weight: bold;
     }
     }
   }
   }
-    .blank_adopzrdd {
+  .blank_adopzrdd {
     display: flex;
     display: flex;
     align-items: center;
     align-items: center;
     > span {
     > span {

+ 8 - 8
src/views/bpm/handleTask/components/materialPlan/detailDialog.vue

@@ -47,7 +47,7 @@
                 </el-link>
                 </el-link>
               </template>
               </template>
 
 
-              
+
 
 
 
 
 
 
@@ -84,7 +84,7 @@
     <timeDialog ref="timeDialogRef"></timeDialog>
     <timeDialog ref="timeDialogRef"></timeDialog>
   </div>
   </div>
 </template>
 </template>
-  
+
 <script>
 <script>
 import { getById } from '@/api/bpm/components/materialPlan/index';
 import { getById } from '@/api/bpm/components/materialPlan/index';
 import { getFile } from '@/api/system/file';
 import { getFile } from '@/api/system/file';
@@ -244,11 +244,11 @@ export default {
           align: 'center',
           align: 'center',
         },
         },
 
 
-        {
-          label: '采购数量',
-          prop: 'purchaseQuantity',
-          align: 'center'
-        },
+        // {
+        //   label: '采购数量',
+        //   prop: 'purchaseQuantity',
+        //   align: 'center'
+        // },
 
 
         {
         {
           label: '到货方式',
           label: '到货方式',
@@ -326,7 +326,7 @@ export default {
   }
   }
 };
 };
 </script>
 </script>
-  
+
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 :deep(.el-table__expanded-cell) {
 :deep(.el-table__expanded-cell) {
 
 

+ 2 - 2
vue.config.js

@@ -38,8 +38,8 @@ module.exports = {
         // target: 'http://124.71.68.31:50001', // 测试环境
         // target: 'http://124.71.68.31:50001', // 测试环境
         // target: 'http://124.71.68.31:50001',
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.105:18086',
         // target: 'http://192.168.1.105:18086',
-        // target: 'http://192.168.1.251:18186',
-        target: 'http://192.168.1.144:18086',
+        target: 'http://192.168.1.251:18186',
+        // target: 'http://192.168.1.144:18086',
         changeOrigin: true, // 只有这个值为true的情况下 s才表示开启跨域
         changeOrigin: true, // 只有这个值为true的情况下 s才表示开启跨域
         pathRewrite: {
         pathRewrite: {
           '^/api': ''
           '^/api': ''