Browse Source

修改需求下发

胡半仙 3 năm trước cách đây
mục cha
commit
30b278baa8

+ 3 - 0
src/views/inward/components/truckAppoint/addRequirement2.vue

@@ -745,6 +745,9 @@ export default {
     width: 320px;
   }
 }
+.preview-group {
+    width: 700px;
+}
 .swtichTop{
   display: flex;
   height: 40px;

+ 0 - 8
src/views/inward/components/truckAppoint/requirement.vue

@@ -15,14 +15,6 @@
       >
         <i class="el-icon-plus"></i>新增
       </el-button>
-      <el-button
-        type="primary"
-        class="btn"
-        @click="Issue"
-        v-if="activeName == 'first'"
-      >
-        <i class="el-icon-download"></i>下发
-      </el-button>
     </div>
     <template>
       <div>

+ 249 - 0
src/views/inward/components/truckAppoint/requirementOther.vue

@@ -0,0 +1,249 @@
+// 提出需求
+<template>
+  <div class="inwardRequirement">
+    <div class="sache">
+      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      </el-input>
+      <el-button type="primary" class="btn">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="toInsert2"
+        v-if="activeName == 'first'"
+      >
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="Issue"
+        v-if="activeName == 'first'"
+      >
+        <i class="el-icon-download"></i>下发
+      </el-button>
+    </div>
+    <template>
+      <div>
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane label="未下发" name="first">
+            <dilTable v-bind.sync="first" @selection-change="selectionChange" ref="table1">
+              <el-table-column fixed="right" label="操作" width="120">
+                <template slot-scope="scope">
+                  <el-button
+                    type="text"
+                    size="mini"
+                    @click="deleteRequirement(scope)"
+                  >
+                    删除
+                  </el-button>
+                </template>
+              </el-table-column>
+            </dilTable>
+          </el-tab-pane>
+          <el-tab-pane label="已下发" name="second">
+            <dilTable v-bind.sync="second" ref="table">
+            <el-table-column fixed="right" label="操作" width="80">
+                <template slot-scope="scope">
+                 <el-button type="text" size="mini" @click="getRequirementOrder(scope)">运单</el-button>
+                </template>
+              </el-table-column>
+            </dilTable>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </template>
+  </div>
+</template>
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  data() {
+    return {
+      inputText: "",
+      orgCode:"",
+      first: {
+        // first请求数据的地址
+        requestUrl:
+          "",
+        selectionType: "select",
+        mapList: [],
+      },
+      second: {
+        // second请求数据的地址
+        requestUrl:
+          "",
+      },
+      //记录旧的row对象(未下发)
+      oldRow: "",
+      //记录上一个展开的点击次数,单数为展开状态,复数为闭合状态(未下发)
+      oldRowCount: 1,
+      //记录旧的row对象(已下发)
+      oldRow1: "",
+      //记录上一个展开的点击次数,单数为展开状态,复数为闭合状态(已下发)
+      oldRowCount1: 1,
+      tableHead: [
+        {
+          prop: "materialName",
+          label: "物资名称",
+          width: 150,
+        },
+        {
+          prop:"loadName",
+          label:"装货点",
+          width:150
+        },
+        {
+          prop:"unloadName",
+          label:"卸货点",
+          width:150
+        },
+        {
+          prop: "materialWeight",
+          label: "物资重量",
+          width: 150,
+        },
+        {
+          prop: "materialCount",
+          label: "物资数量",
+          width: 150,
+        },
+      ],
+      tableData: [],
+      tableData1: [
+        {
+          materialCount : 100
+        }
+      ],
+      activeName: "first",
+    };
+  },
+  created(){
+    if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode") == "zidonghuabu"){
+      this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0"
+      this.second.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1"
+    }else{
+      this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&orgCode=" + getCookie("orgCode")
+      this.second.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&orgCode=" + getCookie("orgCode")
+    }
+  },
+  methods: {
+    //查看需求下面的运单
+    getRequirementOrder(scope){
+      this.$router.push(
+        "/getRequirementOrder/" + scope.row.requirementId
+      );
+    },
+    handleClick(tab, event) {
+      this.getRequestUrl()   
+    },
+    getRequestUrl(){
+      if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode") == "zidonghuabu"){
+      this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&i=" + new Date()
+      this.second.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&i=" + new Date()
+      }else{
+      this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&orgCode=" + getCookie("orgCode") + "&i=" + new Date()
+      this.second.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&orgCode=" + getCookie("orgCode") + "&i=" + new Date()
+      }
+    },
+    selectionChange(selection) {
+      this.first.mapList = selection;
+    },
+    toInsert2() {
+      this.$router.push("/addRequirement2");
+    },
+    updateRequirement(scope) {
+      this.$router.push(
+        "/updateRequirement/" + scope.row.requirementId
+      );
+    },
+    deleteRequirement(scope) {
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post(
+              "/api/v1/ams/deleteTruckRequirement/" + scope.row.requirementId
+            )
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });
+                this.getRequestUrl()
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+    Issue() {
+      console.log(this.first.mapList);
+      if(this.first.mapList.length == 0){
+        this.$message.warning("请选择需求")
+        return
+      }
+      // 权限控制,判断用户是否属于轧钢厂下面的车间
+      this.$confirm("是否下发", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/ams/downRequirement", this.first.mapList)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "下发成功!",
+                });
+              this.getRequestUrl()
+              this.activeName = 'second'
+              } else {
+                this.$message({
+                  message: "下发失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消下发!",
+          });
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+  .inwardRequirement{
+      margin-top: 20px;
+      margin-left: 20px;
+      .sache{
+          margin-top: 30px;
+          padding-bottom: 10px;
+          .el-input {
+            width: 20%;
+            }
+          }
+  }
+</style>

+ 4 - 1
src/views/inward/router/index.js

@@ -8,6 +8,8 @@ import main from '@/components/main.vue'
 // 系统配置管理
 //运输预约--提出需求
 import requirement from '@/views/inward/components/truckAppoint/requirement.vue'
+// 没有提出需求页面
+import requirementOther from '@/views/inward/components/truckAppoint/requirementOther.vue'
 //运输预约--提出采购内转需求
 import purInwardRequirement from '@/views/inward/components/truckAppoint/purInwardRequirement.vue'
 //运输预约--制定计划
@@ -167,7 +169,8 @@ const constantRouterMap = [{
     name: 'requirement'
   },
   children: [
-    {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement}, 
+    {path: 'requirement',name: 'requirement',meta: {code: 'xtpzgl-yhgl'},component: requirement},
+    {path: 'requirementOther',name: 'requirementOther',meta: {code: 'xtpzgl-yhgl'},component: requirementOther}, 
     {path: 'purInwardRequirement',name: 'purInwardRequirement',meta: {code: 'xtpzgl-yhgl'},component: purInwardRequirement}, 
     {path: 'truckAppointPlan',name: 'truckAppointPlan',meta: {code: 'xtpzgl-yhgl'},component: truckAppointPlan},
     {path: 'purInwardTruckOrder',name: 'purInwardTruckOrder',meta: {code: 'xtpzgl-yhgl'},component: purInwardTruckOrder},