Merge branch 'purchaseDev' of http://172.16.100.139/new-business/drp-web into purchaseDev

src/api/changeApply/basic.js

@@ -97,4 +97,11 @@ export function downloadFailData(data) {
     data: data,
     responseType: 'blob',
   })
+}
+
+export function toOA(userName, fdId) {
+  return request({
+    url: `/oaflow/redirectToOa/${userName}/${fdId}`,
+    method: 'get',
+  })
 }

src/views/material/changeApply/index.vue

@@ -59,6 +59,12 @@
           <el-table-column fixed="right" label="操作" width="150" align="center">
             <template slot-scope="scope">
               <el-button type="text" size="small" @click="useSee(scope.row)">查看</el-button>
+              <el-button  
+                v-if="scope.row.oaId && scope.row.oaId !=''" 
+                @click="jumpFlow(scope.row)" 
+                type="text"
+                :size="size"
+              >流程跳转</el-button>
               <el-button @click="handleEdit(scope.row)" v-if="scope.row.status == 0 || scope.row.status == 3" type="text" size="small">编辑</el-button>
               <el-button type="text" size="small" @click="deleteRow(scope.row)" v-if="scope.row.status == 0 || scope.row.status == 3">删除</el-button>
             </template>
@@ -72,7 +78,7 @@
 
 <script>
 import { dicts } from "./dicts";
-import { getChangeList , deleteChangeList} from '@/api/changeApply/basic';
+import { getChangeList , deleteChangeList,toOA} from '@/api/changeApply/basic';
 import useColumns from './columns';
 export default {
   name: 'changeApply',
@@ -102,6 +108,24 @@ export default {
     }
   },
   methods:{
+    async jumpFlow (row){
+
+      const {name} = this.$store.state.user;
+
+      try {
+
+        let {code,msg,oaUrl} = await toOA(name,row.oaId);
+
+        if(code == 200){
+          window.open(oaUrl)
+        }
+        
+      } catch (error) {
+        
+      }finally{
+
+      }
+    },
     
     useReset(){
       this.page.pageNum = 1;

src/views/material/requisition/add.vue

@@ -63,8 +63,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="物料编码" prop="materialCode">
-                  <el-input :disabled="disable" v-model="basicForm.materialCode" disabled></el-input>
+                <el-form-item label="物料编码" prop="code">
+                  <el-input :disabled="disable" v-model="basicForm.code" disabled></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="6">

src/views/material/requisition/columns.js

@@ -20,7 +20,7 @@
     { item: { key: "oneClassify", title: "物料一级分类" ,width:150,}, attr: {} },
     { item: { key: "materialType", title: "物料基本分类" ,width:150,}, attr: {} },
     { 
-      item: { key: "materialCode", title: "物料编码" }, 
+      item: { key: "code", title: "物料编码" }, 
       attr: {
    
       } 

src/views/purchase/task/see/columns.js

@@ -48,7 +48,7 @@ export default function useColumns() {
     },
     { item: { key: "puOrgName", title: "采购组织" }, attr: {} },
     { item: { key: "currencyName", title: "币种" }, attr: {} },
-    { item: { key: "source", title: "需求单号" }, attr: {} },
+    { item: { key: "source", title: "需求来源" }, attr: {} },
     {
       item: { key: "customerName", title: "收货客户" },
       attr: {},

src/views/purchase/task/xie-yi-zhi-cai/index.vue

@@ -181,7 +181,6 @@ export default {
           :columns="tableColumns"
           :size="$attrs.size"
           :dict="dict"
-          
         >
           <template slot="purchaseQuantity" slot-scope="scope">
             <component