Merge remote-tracking branch 'origin/dev' into dev

src/layout/components/Navbar.vue

@@ -25,7 +25,7 @@
 
       </template>
 
-      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
+      <!-- <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
           <img :src="avatar" class="user-avatar">
           <i class="el-icon-caret-bottom" />
@@ -41,7 +41,7 @@
             <span>退出登录</span>
           </el-dropdown-item>
         </el-dropdown-menu>
-      </el-dropdown>
+      </el-dropdown> -->
     </div>
   </div>
 </template>

src/views/material/requisition/index.vue

@@ -153,7 +153,7 @@
 
   export default {
     name: 'requisition',
-    dicts:[...initDicts([...SearchColumns,...TableColumns])],
+    dicts:[...initDicts([...SearchColumns,...TableColumns]),'oa_templete_id'],
     components: {
     addReq,
     ElSuperTable: () => import("@/components/super-table/index.vue"),
@@ -429,6 +429,7 @@
         this.checkedList = selection;
       },
       check(row) {
+        console.log('xxxx',this.dict.type)
         // console.log('查看详情', row)
         this.isList = false
         this.isComponent = 'addReq'
@@ -479,8 +480,9 @@
       async handleBack(row){
         try {
           const { msg, code } = await oaBack({
-            fdTemplateId: process.env.NODE_ENV == "production" ? 
-              '1877e71c5a1929040faa0e647a2ac75e':'1873b5ce924f9cc37c06e884b1e9ee26',
+            fdTemplateId: this.dict.type.oa_templete_id.find(item => {
+              return item.label == "物料申请单"
+            }).value,
             fdId: row.oaId,
             billCode: row.code,
             billMaker: row.createBy

src/views/purchase/PurchaseDemandList/index.vue

@@ -329,7 +329,7 @@ export default {
     Refers,
     TreeRefers
   },
-  dicts: ['sys_processing_mode', 'sys_status', 'sys_bill_source', 'sys_business', 'sys_reserve_ratio', 'sys_period_unit', 'sys_price_type', 'sys_plan_type'],
+  dicts: ['sys_processing_mode', 'sys_status', 'sys_bill_source', 'sys_business', 'sys_reserve_ratio', 'sys_period_unit', 'sys_price_type', 'sys_plan_type', 'oa_templete_id'],
   data() {
     return {
       loading: true,
@@ -690,8 +690,9 @@ export default {
       let params = {
         billCode: row.code, 
         fdId: row.flowId, 
-        fdTemplateId: process.env.NODE_ENV == "production" ? 
-          '188001c472bbac2caa873d14669a33c3' : '18804432233a7813df7921d436ab69b7',
+        fdTemplateId: this.dict.type.oa_templete_id.find(item => {
+          return item.label == "采购需求单"
+        }).value,
         billMaker: row.createBy 
       }
       rebacktWork(params).then(res => {

src/views/purchase/apply/columns.js

@@ -32,6 +32,11 @@ export default function useColumns() {
       item: { key: "sourceType", title: "来源单据类型", width: 100 },
       attr: { is: "el-dict-tag", dictName: "price_source" },
     },
+    // 加个字典获取收回模板id
+    {
+      item: { key: "", title: "", width: 0 },
+      attr: { dictName: "oa_templete_id" },
+    },
   ].map(({ item, attr }) => ({
     attr,
     item: {

src/views/purchase/apply/index.vue

@@ -173,10 +173,12 @@
       },
       // 收回
       async reback(row) {
+        console.log('xxxx',this.dict.type)
         try {
           const { msg, code } = await oaBack({
-            fdTemplateId: process.env.NODE_ENV == "production" ?
-            '18804bd6335dd3a05fd9a12415fb6e70' : '188095a870d007772057d7d4ffaad3c7',
+            fdTemplateId: this.dict.type.oa_templete_id.find(item => {
+              return item.label == "价格申报单"
+            }).value,
             fdId: row.flowId,
             billCode: row.priceCode,
             billMaker: row.createBy

src/views/purchase/purchase-order/index.vue

@@ -19,7 +19,7 @@ TabColumns.forEach(column =>{
 export default {
   name: "PuchaseOrder",
   // dicts: initDicts(SelectColumns),
-  dicts: [...initDicts(allColumns)],
+  dicts: [...initDicts(allColumns), 'oa_templete_id'],
   components: {
     AddDrawer: () => import('./add/index.vue'),
     SeeDrawer: () => import('./see/index.vue'),
@@ -408,9 +408,12 @@ export default {
     },
     //流程收回
     async handleBack(row){
+      console.log('xxxx',this.dict.type)
       try {
         const { msg, code } = await orderApi.oaBack({
-          fdTemplateId: process.env.NODE_ENV == "production" ?'':'1880447a834addc648b3763477a9b09f',
+          fdTemplateId: this.dict.type.oa_templete_id.find(item => {
+              return item.label == "采购订单"
+            }).value,
           fdId: row.flowId,
           billCode: row.code,
           billMaker: row.createBy
@@ -654,8 +657,9 @@ export default {
       return {
         status,
         fdId:flowId,
-        fdTemplateId: process.env.NODE_ENV == "production" ?
-          '188006ef5804ba83b5144264a58ba944' : '1880447a834addc648b3763477a9b09f',
+        fdTemplateId: this.dict.type.oa_templete_id.find(item => {
+          return item.label == "采购订单"
+        }).value,
         billCode:code,
         billMaker:createBy,
       }

src/views/purchase/transferOrder/index.vue

@@ -354,7 +354,7 @@ import Refers from '@/components/Refers/refers.vue'
 import {getOrderList, delOrder, submitOrder,listStAllotItem,importData,oaBack } from '@/api/purchase/transferOrder.js'
 export default {
   name: 'transferOrder',
-  dicts: ['sys_allot_billtype'],
+  dicts: ['sys_allot_billtype', 'oa_templete_id'],
   components: {
     Add,
     CollapseTransition,
@@ -636,9 +636,9 @@ export default {
     async handleBack(row){
       try {
         const { msg, code } = await oaBack({
-          fdTemplateId: process.env.NODE_ENV == "production" ?
-          '188094ce4e3fc061f2bc2a046909173e' : '188095b2398846ad82cad7a46ef9a971',
-          fdId: row.oaId,
+          fdTemplateId: this.dict.type.oa_templete_id.find(item => {
+            return item.label == "调拨订单"
+          }).value,
           billCode: row.code,
           billMaker: row.createBy
         });

vue.config.js

@@ -37,7 +37,7 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://172.16.100.107:8080/drp-admin`, //测试
-       target: `http://test-sy.derom.com/drp-admin`, //测试
+        target: `http://test-sy.derom.com/drp-admin`, //测试
         // target: `http://release-sy.derom.com/drp-admin`, //预发
         // target: `http://sy.derom.com/drp-admin`, //生产
         // target: `http://172.16.63.202:8000/drp-admin`, // D本地
@@ -54,7 +54,7 @@ module.exports = {
         },
       },
       "/drp-file": {
-        target: `https://test-sy.derom.com`,
+        target: `https://sy.derom.com`,
         changeOrigin: true,
         pathRewrite: { [`^/drp-file`]: "" },
       },