Merge branch 'master' of http://106.15.38.8:3000/yaoyq/imcs-yj-fe

imcs-ui/src/api/prepareProductMgr/receive.js

@@ -1,143 +1,143 @@
-/******************** 【原材料接收管理】API ***********************/
-import axiosApi from '../AxiosApi.js'
-
-const apiList = {
-	getList: {
-    method: 'POST',
-    url: `/authority/meterialReceiveLog/all`
-  },
-  page: {
-    method: 'POST',
-    url: `/authority/meterialReceiveLog/page`
-  },
-  update: {
-    method: 'POST',
-    url: `/authority/meterialReceiveLog/update`
-  },
-  save: {
-    method: 'POST',
-    url: `/authority/meterialReceiveLog`
-  },
-  updateStatus: {
-    method: 'POST',
-    url: `/authority/meterialReceiveLog/status`
-  },
-  remove: {
-    method: 'DELETE',
-    url: `/authority/meterialReceiveLog`
-  },
-  delete: {
-    method: 'POST',
-    url: `/authority/meterialReceiveLog/delete`
-  },
-  list: {
-    method: 'POST',
-    url: `/authority/meterialReceiveLog/query`
-  },
-  // 工具原材料规格-批量查询
-  listSpecs: {
-    method: 'POST',
-    url: `/authority/meterialReceiveLogSpecs/getSpecsList`
-  },
-  preview: {
-    method: 'POST',
-    url: `/authority/meterialReceiveLog/preview`
-  },
-  export: {
-    method: 'POST',
-    url: `/authority/meterialReceiveLog/export`
-  },
-  import: {
-    method: 'POST',
-    url: `/authority/meterialReceiveLog/import`
-  }
-}
-
-export default {
-	getList (data) {
-    return axiosApi({
-      ...apiList.getList,
-      data
-    })
-  },
-  page (data) {
-    return axiosApi({
-      ...apiList.page,
-      data
-    })
-  },
-  save (data) {
-    return axiosApi({
-      ...apiList.save,
-      data
-    })
-  },
-  update (data) {
-    return axiosApi({
-      ...apiList.update,
-      data
-    })
-  },
-  updateStatus (data) {
-    return axiosApi({
-      ...apiList.updateStatus,
-      data
-    })
-  },
-  remove (data) {
-    return axiosApi({
-      ...apiList.remove,
-      data
-    })
-  },
-  delete (data) {
-    return axiosApi({
-      ...apiList.remove,
-      data
-    })
-  },
-  list (data) {
-    return axiosApi({
-      ...apiList.list,
-      data
-    })
-  },
-  listSpecs (data) {
-    return axiosApi({
-      ...apiList.listSpecs,
-      data
-    })
-  },
-  check (code) {
-    return axiosApi({
-      method: 'GET',
-      url: `/authority/meterialReceiveLog/check/${code}`
-    })
-  },
-  checkField (data) {
-    return axiosApi({
-      method: 'POST',
-      url: `/authority/meterialReceiveLog/check`,
-      data
-    })
-  },
-  preview (data) {
-    return axiosApi({
-      ...apiList.preview,
-      data
-    })
-  },
-  export (data) {
-    return axiosApi({
-      ...apiList.export,
-      responseType: "blob",
-      data
-    })
-  },
-  import (data) {
-    return axiosApi({
-      ...apiList.import,
-      data
-    })
-  }
-}
+/******************** 【原材料接收管理】API ***********************/
+import axiosApi from '../AxiosApi.js'
+
+const apiList = {
+	getList: {
+    method: 'POST',
+    url: `/authority/meterialReceiveLog/all`
+  },
+  page: {
+    method: 'POST',
+    url: `/authority/meterialReceiveLog/page`
+  },
+  update: {
+    method: 'POST',
+    url: `/authority/meterialReceiveLog/update`
+  },
+  save: {
+    method: 'POST',
+    url: `/authority/meterialReceiveLog`
+  },
+  updateStatus: {
+    method: 'POST',
+    url: `/authority/meterialReceiveLog/status`
+  },
+  remove: {
+    method: 'DELETE',
+    url: `/authority/meterialReceiveLog`
+  },
+  delete: {
+    method: 'POST',
+    url: `/authority/meterialReceiveLog/delete`
+  },
+  list: {
+    method: 'POST',
+    url: `/authority/meterialReceiveLog/query`
+  },
+  // 工具原材料规格-批量查询
+  listSpecs: {
+    method: 'POST',
+    url: `/authority/meterialReceiveLogSpecs/getSpecsList`
+  },
+  preview: {
+    method: 'POST',
+    url: `/authority/meterialReceiveLog/preview`
+  },
+  export: {
+    method: 'POST',
+    url: `/authority/meterialReceiveLog/export`
+  },
+  import: {
+    method: 'POST',
+    url: `/authority/meterialReceiveLog/import`
+  }
+}
+
+export default {
+	getList (data) {
+    return axiosApi({
+      ...apiList.getList,
+      data
+    })
+  },
+  page (data) {
+    return axiosApi({
+      ...apiList.page,
+      data
+    })
+  },
+  save (data) {
+    return axiosApi({
+      ...apiList.save,
+      data
+    })
+  },
+  update (data) {
+    return axiosApi({
+      ...apiList.update,
+      data
+    })
+  },
+  updateStatus (data) {
+    return axiosApi({
+      ...apiList.updateStatus,
+      data
+    })
+  },
+  remove (data) {
+    return axiosApi({
+      ...apiList.remove,
+      data
+    })
+  },
+  delete (data) {
+    return axiosApi({
+      ...apiList.delete,
+      data
+    })
+  },
+  list (data) {
+    return axiosApi({
+      ...apiList.list,
+      data
+    })
+  },
+  listSpecs (data) {
+    return axiosApi({
+      ...apiList.listSpecs,
+      data
+    })
+  },
+  check (code) {
+    return axiosApi({
+      method: 'GET',
+      url: `/authority/meterialReceiveLog/check/${code}`
+    })
+  },
+  checkField (data) {
+    return axiosApi({
+      method: 'POST',
+      url: `/authority/meterialReceiveLog/check`,
+      data
+    })
+  },
+  preview (data) {
+    return axiosApi({
+      ...apiList.preview,
+      data
+    })
+  },
+  export (data) {
+    return axiosApi({
+      ...apiList.export,
+      responseType: "blob",
+      data
+    })
+  },
+  import (data) {
+    return axiosApi({
+      ...apiList.import,
+      data
+    })
+  }
+}

imcs-ui/src/views/zuihou/prepareProductMgr/material/components/View.vue

@@ -7,6 +7,13 @@
     class="tenant-view"
   >
     <div>
+      <el-row class="filter-container">
+        <el-col>
+          <el-button type="danger" icon="el-icon-delete" size="medium" v-has-permission="['order:delete']" @click="meterialDelete">
+            {{ $t("table.delete") }}
+          </el-button>
+        </el-col>
+      </el-row>
     	<!-- 列表数据 -->
 	    <el-table
 	      :key="tableKey"
@@ -128,6 +135,10 @@
     		this.fetch();
 	    },
 
+      search () {
+        this.fetch();
+      },
+
 	    // 【关闭】当前弹出框
 	    close () {
 	      this.$emit('close')
@@ -160,6 +171,54 @@
 
 	    },
 
+      meterialDelete(){
+        if(this.checkData()){
+          this.$confirm('确认删除?', this.$t("common.tips"), {
+            distinguishCancelAndClose: true,
+            confirmButtonText: this.$t("common.confirm"),
+            cancelButtonText: this.$t("common.cancel"),
+            type: "warning"
+          }).then(() => {
+            let obj = {
+              id: this.selection[0].id
+            }
+            ReceiveApi.delete(obj).then(res => {
+              res = res.data
+              if (res.isSuccess) {
+                this.$message({
+                  message: this.$t('tips.optionSuccess'),
+                  type: 'success'
+                })
+                // 更新列表
+                this.search()
+                // 清理Table的选择数据
+                this.$refs.table.clearSelection()
+              }
+            })
+          }).catch(() => {})
+        }
+      },
+
+      // 验证是否选中数据-函数
+      checkData(){
+        let flag = true
+        if (!this.selection.length) {
+          this.$message({
+            message: this.$t("tips.noDataSelected"),
+            type: "warning"
+          })
+          flag = false
+        }
+        if (this.selection.length > 1) {
+          this.$message({
+            message: this.$t("tips.mustOne"),
+            type: "warning"
+          })
+          flag = false
+        }
+        return flag
+      },
+
 	    // Table的cell点击事件
 	    cellClick (row, column) {
 	      if (column['columnKey'] === "operation") {