Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

build/utils.js

@@ -17,6 +17,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
 let devModules = ['all']
+//let devModules = ['index']
 // let devModules = ['index', 'statisticalReport', 'inward', 'appoint']
 // let devModules = ['index', 'ADMINISTRATORS']
 

src/views/RMS/components/addMaterial.vue

@@ -9,11 +9,12 @@
       <el-input v-model="materialTypeName" disabled> </el-input>
       <el-button type="primary" @click="openDrawer">物资种类</el-button>
     </div>
-    <div class="eldrawer">
+    <div class="materialDrawer">
       <el-drawer
         :visible.sync="drawer"
         :direction="direction"
         :before-close="handleClose"
+        size="50%"
       >
         <el-input
           placeholder="请输入内容"
@@ -29,6 +30,7 @@
           <dilTable
             v-bind.sync="options"
             @radio-change="currentRadioChange"
+            max-height="300px"
           ></dilTable>
         </div>
       </el-drawer>

src/views/RMS/components/addOilPrice.vue

@@ -14,6 +14,13 @@
       </el-select>
       <el-button type="primary" @click="dialogVisible = true">新增油品名称</el-button>
     </div>
+    <div id="formType">
+      <span>运输类型</span>
+      <el-select v-model="transportationType" placeholder="请选择">
+        <el-option label="销售" value="1"></el-option>
+        <el-option label="内转" value="2"></el-option>
+      </el-select>
+    </div>
     <div id="form_box" style="margin-right: 10rem">
       <dil-form :formId="357" v-model="form1" ref="from1" @change="onchang"></dil-form>
     </div>
@@ -45,6 +52,8 @@ export default {
     return {
       //下拉框选中的值
       oilNameId:null,
+      //运输类型
+      transportationType:'',
       //加载状态
       loading:false,
       //油品名称新增的值
@@ -101,6 +110,8 @@ export default {
         this.$message.warning('请填写油品价格')
       }else if(!isNumber(this.form1.priceValue)){
         this.$message.warning('油品价格必修为整数或者小数')
+      }else if(!this.transportationType){
+        this.$message.warning('请填写运输类型')
       }else{
         state = true;
       }
@@ -109,7 +120,8 @@ export default {
           oilNameId:this.oilNameId,
           priceValue:this.form1.priceValue,
           priceDate:sjTime(this.form1.priceDate),
-          priceStatus:this.form1.priceStatus
+          priceStatus:this.form1.priceStatus,
+          transportationType:this.transportationType
         };
         console.log(RmsOilPrice);
         this.axios.post("/api/v1/rms/insertOilPrice" , RmsOilPrice)
@@ -147,6 +159,15 @@ export default {
       margin-right: 20px;
     }
   }
+  #formType{
+    margin-left: 35%;
+    margin-top: 10px;
+    .el-select{
+      width: 250px;
+      margin-left: 60px;
+      margin-right: 20px;
+    }
+  }
   #form_box{
     margin-left: 35%;
     padding-top: 10px;

src/views/RMS/components/editInwardContractMaterial.vue

@@ -0,0 +1,89 @@
+<template>
+  <!-- 添加港口信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+    <div style="width:400px;margin-top: 20px;margin-left: 500px;">
+      <el-input
+      v-model="materialTypeName"
+      >
+      </el-input>
+    </div>
+    <div class="button-box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+      materialTypeName:'',
+      materialTypeId:null
+    };
+  },
+  mounted() {
+    this.materialTypeId=this.$route.params.materialTypeId
+    this.materialTypeName=this.$route.params.materialTypeName
+    console.log("数据显示")
+    console.log(this.materialTypeName)
+    console.log(this.materialTypeId)
+  },
+  methods: {
+    makeSure() {
+      let mapValue={
+        materialTypeId:this.materialTypeId,
+        materialTypeName:this.materialTypeName
+      }
+      this.axios
+        .post("/api/v1/rms/updateMaterialForInward", mapValue)
+        .then(res => {
+          if (res.data.code == 0) {
+            this.$message.success("修改成功");
+            this.$router.go(-1);
+          } else {
+            this.$message.success("修改失败");
+            this.$router.go(-1);
+          }
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    }
+  }
+};
+</script>
+<style lang="scss">
+.button-box {
+  display: flex;
+  justify-content: center;
+  .el-button {
+    width: 80px;
+    margin-right: 10px;
+  }
+}
+.form-box {
+  display: flex;
+  justify-content: center;
+  .el-form-item {
+    display: flex;
+    justify-content: center;
+    .el-form-item__label {
+      display: flex;
+      align-items: center;
+    }
+    .el-form-item__content {
+      .el-input {
+        .el-input__inner {
+          width: 250px;
+        }
+      }
+    }
+  }
+}
+</style>

src/views/RMS/components/editMaterial.vue

@@ -17,8 +17,8 @@
     <div class="eldrawer">
       <el-drawer
         :visible.sync="drawer"
-        :direction="direction"
         :before-close="handleClose"
+        :direction="direction"
       >
         <el-input
           placeholder="请输入内容"
@@ -81,6 +81,10 @@ export default {
       this.materialTypeName = this.mapList.materialTypeName;
     },
     information() {
+      console.log("数据显示")
+      console.log(this.$route.params.materialTypeName)
+      console.log(this.$route.params.materialId)
+      this.materialTypeName=this.$route.params.materialTypeName
       //编辑
       this.axios
         .post("/api/v1/rms/getMaterialById/" + this.$route.params.materialId)
@@ -88,7 +92,6 @@ export default {
           console.log(res);
           res.data.data.forEach(e => {
             this.form1 = e;
-            console.log(e);
             console.log(this.form1);
             console.log(this.$route.params.materialId);
           });

src/views/RMS/components/gatepost.vue

@@ -18,13 +18,13 @@
       <dilTable v-bind.sync="options">
         <el-table-column fixed="right" label="操作" width="100">
           <template slot-scope="scope">
-            <el-button
+            <!-- <el-button
               type="text"
               size="mini"
               @click="updateGatepostRules(scope)"
             >
               详细
-            </el-button>
+            </el-button> -->
             <el-button
               type="text"
               size="small"

src/views/RMS/components/inwardContractMaterial.vue

@@ -6,7 +6,19 @@
       <el-button type="primary" @click="onInsert">新增</el-button>
     </div>
     <div class="table">
-      <dilTable v-bind.sync="option" ref="table"> </dilTable>
+      <dilTable v-bind.sync="option" ref="table"> 
+        <el-table-column
+           fixed="right"
+           label="操作"
+           width="200px"
+           align="center"
+        >
+        <template slot-scope="scope">
+          <el-button type="primary" @click="updateSomeData(scope.row)">修改</el-button>
+          <el-button type="primary" @click="deleteSomeData(scope.row)">删除</el-button>
+        </template>
+        </el-table-column>
+      </dilTable>
     </div>
   </div>
 </template>
@@ -22,7 +34,36 @@ export default {
   methods: {
     onInsert() {
       this.$router.push("/addInwardContractMaterial");
-    }
+    },
+    updateSomeData(row){
+      this.$router.push({
+        name:"editInwardContractMaterial",
+        params:{
+          materialTypeId:row.materialTypeId,
+          materialTypeName:row.materialTypeName
+        }
+      })
+    },
+    deleteSomeData(row){
+      let mapValue={
+        materialTypeId:row.materialTypeId,
+        materialTypeName:row.materialTypeName
+      }
+      this.$confirm("你确定要删除吗","提示",{
+        confirmButtonText:"确定",
+        cancelButtonText:"取消",
+        type:"warning"
+      }).then(()=>{
+        this.axios.post("/api/v1/rms/deleteMaterialForInward", mapValue)
+        .then((res)=>{
+          if(res.data.code=='200'){
+            this.$message.success("删除成功")
+            this.$router.go(0)
+          }
+        })
+      })
+      .catch()
+    },
   }
 };
 </script>

src/views/RMS/components/material.vue

@@ -61,7 +61,14 @@ export default {
     },
     updateMaterial(scope){
       console.log(scope.row.materialId)
-      this.$router.push("/editMaterial/"+scope.row.materialId)
+      //this.$router.push("/editMaterial/"+scope.row.materialId)
+      this.$router.push({
+        name:'editMaterial',
+        params:{
+          materialId:scope.row.materialId,
+          materialTypeName:scope.row.materialTypeName
+        }
+      })
     },
     deleteMaterial(scope){
       this.$confirm("是否删除", "提示", {

src/views/RMS/components/oilPrice.vue

@@ -108,12 +108,19 @@ export default {
       });
     },
     onEnable(scope){
+      console.log("数据显示")
+      console.log(scope.row)
+      let map={
+        priceId:scope.row.priceId,
+        transportationType:scope.row.transportType
+      }
+      console.log(map)
       this.$confirm('将要启用该油价, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.axios.post("/api/v1/rms/updateOilPrice",{"priceId":scope.row.priceId}).then((res) => {
+        this.axios.post("/api/v1/rms/updateOilPrice",map).then((res) => {
           if (res.data.code == "200") {
             this.$message({ type: "success", message: "启用成功!",});
             this.options.requestUrl = "/api/v1/rms/getOilPriceResultList?apiId=380&i="+ new Date();

src/views/RMS/router/index.js

@@ -60,6 +60,7 @@ import truckCalculate from '../components/truckCalculate.vue'
 import consignee from '../components/consignee.vue'
 import inwardContractMaterial from '../components/inwardContractMaterial'
 import addInwardContractMaterial from '../components/addInwardContractMaterial.vue'
+import editInwardContractMaterial from '../components/editInwardContractMaterial.vue'
 import editInwardMaterial from '../components/editInwardMaterial.vue'
 import cargoDep from '../components/cargoDep.vue'
 import addCargoDep from '../components/addCargoDep.vue'
@@ -131,6 +132,7 @@ const constantRouterMap = [
 		{path: 'consignee', name: 'consignee', meta: {code: 'xtpzgl-yhgl'}, component: consignee},
 		{path: 'inwardContractMaterial', name: 'inwardContractMaterial', meta: {code: 'xtpzgl-yhgl'}, component: inwardContractMaterial},
 		{path: 'addInwardContractMaterial', name: 'addInwardContractMaterial', meta: {code: 'xtpzgl-yhgl'}, component: addInwardContractMaterial},
+		{path: 'editInwardContractMaterial', name: 'editInwardContractMaterial', meta: {code: 'xtpzgl-yhgl'}, component: editInwardContractMaterial},
 		{path: 'editInwardMaterial/:materialTypeId', name: 'editInwardMaterial', meta: {code: 'xtpzgl-yhgl'}, component: editInwardMaterial},	
 		{path: 'cargoDep', name: 'cargoDep', meta: {code: 'xtpzgl-yhgl'}, component: cargoDep},	
 		{path: 'addCargoDep', name: 'addCargoDep', meta: {code: 'xtpzgl-yhgl'}, component: addCargoDep},	

src/views/appoint/components/saleContract/addTransportPrice.vue

@@ -391,7 +391,9 @@ export default {
       this.selectLineLoading = true;
       this.isKuang = true;
       if(this.LineText){
-        this.oilPriceFormula.requestUrl = "api/v1/uc/getOilFormula?apiId=444&con="+this.LineText;
+         console.log("进入了查询阶段")
+         console.log(this.LineText)
+        this.oilPriceFormula.requestUrl = "api/v1/uc/getOilFormula?apiId=444&con="+this.LineText+"&i=" + new Date();
       }else{
         this.oilPriceFormula.requestUrl = "api/v1/uc/getOilFormula?apiId=444&i=" + new Date();
       }

src/views/inward/components/inwardFactory/tareWeightResult.vue

@@ -3,7 +3,7 @@
   <!-- 零星物资计皮作业页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <span class="text">计重时间：</span>
+      <span class="text">计量时间：</span>
       <el-date-picker
         v-model="startTime"
         type="datetime"

src/views/inward/components/offsetSteel/saleSteelTruckOrder/platformStockInfo.vue

@@ -47,6 +47,9 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
+          <el-button type="primary" class="btn" @click="onclick">
+            <i class="el-icon-search"></i>
+          </el-button>
           <el-button type="primary" @click="exportAllReportToExcel"
             ><i class="el-icon-download"></i>Excel</el-button
           >
@@ -55,9 +58,6 @@
           <el-button type="primary" @click="refresh">
             <i class="el-icon-refresh"></i>
           </el-button>
-          <el-button type="primary" class="btn" @click="onclick">
-            <i class="el-icon-search"></i>
-          </el-button>
           <el-button type="primary" class="btn" @click="batchOperate"
             >批量保存</el-button
           >
@@ -640,7 +640,7 @@ export default {
         spinner: "el-icon-loading",
         background: "rgba(0, 0, 0, 0.7)"
       });
-      var title = this.tableTitle;
+      var title = "火车发运明细";
       let tHeader = [];
       let filterVal = [];
       console.log(this.$refs.tableRef);

src/views/sale/components/dilNotice/addNotice.vue

@@ -4,7 +4,7 @@
   <div>
     <PageTitle>返回</PageTitle>
 
-    <div class="form-box" style="margin-right: 10rem;width: 1200px">
+    <div class="form" style="margin-right: 10rem;width: 1200px">
       <dil-form :formId="391" v-model="form1" ref="from1">
       </dil-form>
     </div>
@@ -104,7 +104,7 @@ export default {
   margin-top: 5px;
   margin-bottom: 20px;
 }
-.form-box{
+.form{
   .el-form{
     margin-top: 100px;
     margin-left: 200px;

src/views/sale/components/dilNotice/addNotice1.vue

@@ -3,7 +3,7 @@
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
 
-    <div class="form-box" style="margin-right: 10rem">
+    <div class="form" style="margin-right: 10rem">
       <dil-form :formId="389" v-model="form1" ref="from1"></dil-form>
     </div>
 
@@ -108,7 +108,7 @@ export default {
   margin-top: 0.3125rem;
   margin-bottom: 1.25rem;
 }
-.form-box{
+.form{
   .el-form{
     margin-top: 100px;
     margin-left: 200px;

src/views/sale/components/dilNotice/addNotice2.vue

@@ -3,7 +3,7 @@
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
 
-    <div class="form-box" style="margin-right: 10rem">
+    <div class="form" style="margin-right: 10rem">
       <dil-form :formId="390" v-model="form1" ref="from1"></dil-form>
     </div>
 
@@ -109,7 +109,7 @@ export default {
   margin-top: 0.3125rem;
   margin-bottom: 1.25rem;
 }
-.form-box{
+.form{
   .el-form{
     margin-top: 100px;
     margin-left: 200px;