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

src/views/material/changeApply/index.vue

@@ -58,15 +58,15 @@
         >
           <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 type="text" size="small" @click.stop="useSee(scope.row)">查看</el-button>
               <el-button  
                 v-if="scope.row.oaId && scope.row.oaId !=''" 
-                @click="jumpFlow(scope.row)" 
+                @click.stop="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>
+              <el-button @click.stop="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.stop="deleteRow(scope.row)" v-if="scope.row.status == 0 || scope.row.status == 3">删除</el-button>
             </template>
           </el-table-column>
         </el-super-table>

src/views/material/requisition/add.vue

@@ -1270,6 +1270,8 @@
           if (res.code === 200) {
 
             this.basicForm = res.data;
+            const { id, name, nickName, } =
+            this.$store.state.user;
 
             if (this.pageStu === 'copy') {
 
@@ -1300,6 +1302,10 @@
               this.basicForm.updateTime = '';
 
               this.basicForm.auditTime = '';
+
+              this.basicForm.proposerName = nickName;
+
+              this.basicForm.proposerId = name;
               
               this.basicForm.applyBillInfo.auditTime = '';
 

src/views/material/requisition/columns.js

@@ -116,14 +116,14 @@
         clearable: true,
       },
     },
-    {
-      item: { key: "createTimeString", title: "申请时间" },
-      attr: {
-        is: "el-date-picker", 
-        valueFormat: "yyyy-MM-dd" ,
-        clearable: true,
-      },
-    },
+    // {
+    //   item: { key: "createTimeString", title: "申请时间" },
+    //   attr: {
+    //     is: "el-date-picker", 
+    //     valueFormat: "yyyy-MM-dd" ,
+    //     clearable: true,
+    //   },
+    // },
     {
       item: { key: "reviewedName", title: "最后审批人" },
       attr: {
@@ -136,14 +136,14 @@
         clearable: true,
       },
     },
-    {
-      item: { key: "auditTimeString", title: "审批时间" },
-      attr: {
-        is: "el-date-picker", 
-        valueFormat: "yyyy-MM-dd" ,
-        clearable: true,
-      },
-    },
+    // {
+    //   item: { key: "auditTimeString", title: "审批时间" },
+    //   attr: {
+    //     is: "el-date-picker", 
+    //     valueFormat: "yyyy-MM-dd" ,
+    //     clearable: true,
+    //   },
+    // },
     {
       item: { key: "manufacturerName", title: "生产厂家/代理人" },
       attr: {
@@ -163,6 +163,40 @@
         is: "el-input",
       },
     },
+    {
+      item:{
+        key: "createTimeString",
+        title: "申请时间",
+        span:12,
+      },
+      attr: {
+        clearable:true,
+        // is: "el-date-wrapper",
+        is: "el-date-picker",
+        type:"daterange",
+        rangeSeparator:"-",
+        startPlaceholder:"开始日期",
+        endPlaceholder:"结束日期",
+        valueFormat:"yyyy-MM-dd",
+      },
+    },
+    
+    {
+      item:{
+        key: "auditTimeString",
+        title: "审批时间",
+        span:12,
+      },
+      attr: {
+        clearable:true,
+        is: "el-date-picker",
+        type:"daterange",
+        rangeSeparator:"-",
+        startPlaceholder:"开始日期",
+        endPlaceholder:"结束日期",
+        valueFormat:"yyyy-MM-dd",
+      },
+    },
     
   
   ].map(({ item, attr }) => ({

src/views/material/requisition/index.vue

@@ -89,16 +89,16 @@
               <el-button 
                 type="text" 
                 :size="size" 
-                @click="check(scope.row)"
+                @click.stop="check(scope.row)"
               >查看</el-button>
               <el-button 
-                @click="edit(scope.row)" 
+                @click.stop="edit(scope.row)" 
                 v-if="scope.row.status == 0 || scope.row.status == 3" 
                 type="text"
                 :size="size"
               >编辑</el-button>
               <el-button 
-                @click="jumpFlow(scope.row)" 
+                @click.stop="jumpFlow(scope.row)" 
                 v-if="scope.row.oaId && scope.row.oaId !=''" 
                 type="text"
                 :size="size"
@@ -106,7 +106,7 @@
               <el-button 
                 type="text" 
                 :size="size"
-                @click="deleteRow(scope.row)"
+                @click.stop="deleteRow(scope.row)"
                 v-if="scope.row.status == 0 || scope.row.status == 3"
               >删除</el-button>
             </template>

src/views/purchase/task/columns.js

@@ -113,14 +113,24 @@ export default function useColumns() {
       },
     },
     {
-      item: {
-        key: "materialDesc",
-        title: "物料描述",
+      item: { 
+        key: "existPrice", 
+        title: "是否有价格",
       },
-      attr: {
-        is: "el-input",
+      attr: { 
+        is: "el-select", 
+        dictName: "sys_true_false" 
       },
     },
+    // {
+    //   item: {
+    //     key: "materialDesc",
+    //     title: "物料描述",
+    //   },
+    //   attr: {
+    //     is: "el-input",
+    //   },
+    // },
     {
       item: {
         key: "code",
@@ -200,6 +210,26 @@ export default function useColumns() {
         valueKey: "name",
       },
     },
+    // {
+    //   item: { 
+    //     key: "", 
+    //     title: "紧急标识",
+    //   },
+    //   attr: { 
+    //     is: "el-select", 
+    //     dictName: "sys_yes_no" 
+    //   },
+    // },
+    // {
+    //   item: { 
+    //     key: "", 
+    //     title: "补单标识",
+    //   },
+    //   attr: { 
+    //     is: "el-select", 
+    //     dictName: "sys_yes_no" 
+    //   },
+    // },
     {
       item: {
         key: "documentsCodes",