Merge branch 'lx-dev' of gitee.com:cabbage_qd/web-base-admin into lx-online

src/views/framework/architecture/azjg2.vue

@@ -107,10 +107,15 @@
                 <div class="linetitle">{{ '会员编号' }}</div>
                 <div class="linecontent">{{ treeData.memberCode }}</div>
               </div>
+
               <div class="lineboex">
                 <div class="linetitle">{{ '会员姓名' }}</div>
                 <div class="linecontent">{{ treeData.name }}</div>
               </div>
+              <div class="lineboex">
+                <div class="linetitle">安置部门</div>
+                <div class="linecontent">{{ `第${treeData.placeDept}部门` }}</div>
+              </div>
               <div class="lineboex">
                 <div class="linetitle">{{ '支付日期' }}</div>
                 <div class="linecontent">{{ treeData.payDate }}</div>

src/views/framework/architecture/azjg3.vue

@@ -115,6 +115,10 @@
             <div class="linetitle">{{ '会员姓名' }}</div>
             <div class="linecontent">{{ popdata.name }}</div>
           </div>
+          <div class="lineboex">
+            <div class="linetitle">安置部门</div>
+            <div class="linecontent">{{ `第${popdata.placeDept}部门` }}</div>
+          </div>
           <div class="lineboex">
             <div class="linetitle">{{ '支付日期' }}</div>
             <div class="linecontent">{{ popdata.payDate }}</div>
@@ -416,6 +420,10 @@ export default {
                 <div class='linetitle'>{ '会员姓名' }</div>
                 <div class='linecontent'>{data.name}</div>
               </div>
+              <div class='lineboex'>
+                <div class='linetitle'>安置部门</div>
+                <div class='linecontent'>{ `第${data.placeDept}部门` }</div>
+              </div>
               <div class='lineboex'>
                 <div class='linetitle'>{ '支付日期' }</div>
                 <div class='linecontent'>{data.payDate}</div>

src/views/framework/architecture/azjg4.vue

@@ -103,6 +103,10 @@
                 <div class="linetitle">{{ '会员姓名' }}</div>
                 <div class="linecontent">{{ treeData.name }}</div>
               </div>
+              <div class="lineboex">
+                <div class="linetitle">安置部门</div>
+                <div class="linecontent">{{ `第${treeData.placeDept}部门` }}</div>
+              </div>
               <div class="lineboex">
                 <div class="linetitle">{{ '支付日期' }}</div>
                 <div class="linecontent">{{ treeData.payDate }}</div>

src/views/framework/architecture/azjg5.vue

@@ -101,6 +101,10 @@
                 <div class="linetitle">{{ '会员姓名' }}</div>
                 <div class="linecontent">{{ treeData.name }}</div>
               </div>
+              <div class="lineboex">
+                <div class="linetitle">安置部门</div>
+                <div class="linecontent">{{ `第${treeData.placeDept}部门` }}</div>
+              </div>
               <div class="lineboex">
                 <div class="linetitle">{{ '支付日期' }}</div>
                 <div class="linecontent">{{ treeData.payDate }}</div>
@@ -445,6 +449,7 @@ export default {
                 <div class='topbox'>
                   <div>{data.name}</div>
                   <div>{data.memberCode}</div>
+                  <div>第{data.placeDept}部门</div>
                   {/* <div>会员姓名：{data.name}</div>
                    <div>会员编号：{data.memberCode}</div> */}
                 </div>

src/views/framework/architecture/index.vue

@@ -109,13 +109,18 @@
             </div>
             <div class="centerbox">
               <div class="lineboex">
-                <div class="linetitle">{{ '会员编号' }}</div>
+                <div class="linetitle">会员编号</div>
                 <div class="linecontent">{{ treeData.memberCode }}</div>
               </div>
               <div class="lineboex">
-                <div class="linetitle">{{ '会员姓名' }}</div>
+                <div class="linetitle">会员姓名</div>
                 <div class="linecontent">{{ treeData.name }}</div>
               </div>
+              <div class="lineboex">
+                <div class="linetitle">安置部门</div>
+                <div class="linecontent">{{ `第${treeData.placeDept}部门` }}</div>
+              </div>
+
               <div class="lineboex">
                 <div class="linetitle">{{ '支付日期' }}</div>
                 <div class="linecontent">{{ treeData.payDate }}</div>

vue.config.js

@@ -42,21 +42,21 @@ module.exports = {
       warnings: false,
       errors: true
     },
-    proxy: {
-      '/prod-api': {
-        target: 'http://localhost:8080/',
-        changeOrigin: true,
-        pathRewrite: {
-          '^/prod-api': ''
-        }
-      }
-    }
     // proxy: {
     //   '/prod-api': {
-    //     target: 'http://t-mana.beida413.com/',
+    //     target: 'http://localhost:8080/',
     //     changeOrigin: true,
+    //     pathRewrite: {
+    //       '^/prod-api': ''
+    //     }
     //   }
     // }
+    proxy: {
+      '/prod-api': {
+        target: 'http://t-mana.beida413.com/',
+        changeOrigin: true
+      }
+    }
     // before: require('./mock/mock-server.js')
   },
   configureWebpack: {