Merge branch 'purchaseDev' into 'dev'

Purchase dev

See merge request new-business/drp-web!221

src/views/material/requisition/index.vue

@@ -100,11 +100,12 @@
           fixed="right"
           label="操作"
           align="center"
-          width="150"
+          width="180"
           >
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="check(scope.row)">查看</el-button>
             <el-button @click="edit(scope.row)" v-if="scope.row.status == 0 || scope.row.status == 3" type="text" size="small">编辑</el-button>
+            <el-button @click="commit(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>
         </el-table-column>
@@ -243,6 +244,9 @@ export default {
       this.rowDetail = row
       this.disable = false
     },
+    commit(row) {
+      console.log('row', row)
+    },
     deleteRow(row) {
       this.$confirm('是否删除此条数据?', '提示', {
           confirmButtonText: '确定',

src/views/purchase/PurchaseDemandList/add.vue

@@ -1188,6 +1188,7 @@ export default {
     },
     // 粘贴来的数据
     async pasteMe(e, scope, index) {
+      this.$modal.loading("正在处理数据...");
       e.preventDefault() //阻止默认粘贴事件
       let source = e.clipboardData.getData("Text");
       console.log('scope', scope.column.property)
@@ -1346,8 +1347,12 @@ export default {
               this.basicForm.puDemandItemList.push(line)
               // console.log('临时数组', line)
             }
+            this.$modal.msgSuccess("共粘贴" + rowList.length + '条数据');
           }
+        }).catch(err => {
+          this.$modal.closeLoading();
         })
+        this.$modal.closeLoading();
       console.log('列表', this.basicForm.puDemandItemList)
       } else {
         this.$modal.msgWarning("复制长度不能超过1000!");

src/views/purchase/PurchaseDemandList/index.vue

@@ -183,11 +183,12 @@
           fixed="right"
           label="操作"
           align="center"
-          width="150"
+          width="180"
           >
           <template slot-scope="scope">
             <el-button type="text" size="mini" @click="check(scope.row)">查看</el-button>
             <el-button type="text" size="mini" v-if="scope.row.status == '0' || scope.row.status == '3'" @click="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="mini" v-if="scope.row.status == '0' || scope.row.status == '3'" @click="commit(scope.row)">提交</el-button>
             <el-button type="text" size="mini" v-if="scope.row.status == '0' || scope.row.status == '3'" @click="deleteids(scope.row)">删除</el-button>
           </template>
         </el-table-column>
@@ -289,7 +290,7 @@ import Add from './add.vue'
 import Refers from '@/components/Refers/refers.vue'
 import TreeRefers from '@/components/Refers/treeRefer.vue'
 import CollapseTransition from '@/components/MyCollapse/collapse.vue'
-import {getDemandList, delDemand, downLoadDemand, exportDemand } from '@/api/purchase/purchaseDemand.js'
+import {getDemandList, delDemand, downLoadDemand, exportDemand, submitDemand } from '@/api/purchase/purchaseDemand.js'
 export default {
   name: 'PurchaseDemandList',
   components: {
@@ -572,6 +573,19 @@ export default {
       this.rowDetail = row
       this.disable = false
     },
+    commit(row) {
+      console.log('row', row)
+      this.$modal.loading("提交中...");
+      submitDemand(row).then(res => {
+        if (res.code === 200) {
+          this.$modal.msgSuccess("提交成功");
+          this.$modal.closeLoading();
+          this.getList(this.queryParams)
+        }
+      }).catch(err => {
+        this.$modal.closeLoading();
+      })
+    },
     // 行内删除
     deleteids(row) {
       console.log('row', row)

src/views/purchase/transferOrder/index.vue

@@ -139,11 +139,12 @@
           fixed="right"
           label="操作"
           align="center"
-          width="150"
+          width="180"
           >
           <template slot-scope="scope">
             <el-button type="text" size="mini" @click="check(scope.row)">查看</el-button>
             <el-button type="text" size="mini" v-if="scope.row.status == '0' || scope.row.status == '3'" @click="edit(scope.row)">编辑</el-button>
+            <el-button type="text" size="mini" v-if="scope.row.status == '0' || scope.row.status == '3'" @click="commit(scope.row)">提交</el-button>
             <el-button type="text" size="mini" v-if="scope.row.status == '0' || scope.row.status == '3'" @click="deleteids(scope.row)">删除</el-button>
           </template>
         </el-table-column>
@@ -325,7 +326,7 @@
 import Add from './add.vue'
 import CollapseTransition from '@/components/MyCollapse/collapse.vue'
 import Refers from '@/components/Refers/refers.vue'
-import {getOrderList, delOrder} from '@/api/purchase/transferOrder.js'
+import {getOrderList, delOrder, submitOrder } from '@/api/purchase/transferOrder.js'
 export default {
   name: 'transferOrder',
   dicts: ['sys_allot_billtype'],
@@ -418,6 +419,18 @@ export default {
       this.rowDetail = row
       this.disable = false
     },
+    commit(row) {
+      this.$modal.loading("提交中...");
+      submitOrder(row).then(res => {
+        if (res.code === 200) {
+          this.$modal.closeLoading();
+          this.$modal.msgSuccess("提交成功");
+          this.getList(this.queryParams)
+        }
+      }).catch(err => {
+        this.$modal.closeLoading();
+      })
+    },
     // 选中某行
     select(row) {
       console.log('选中', row)