前端

src/App.vue

@@ -139,4 +139,20 @@ input[type='number'] {
   display: flex;
   align-items: center;
 }
+.bg-right{
+  text-align:right;
+}
+.bg{
+  overflow-y: scroll;
+}
+.flex-justify-space-between{
+  display: flex;
+  justify-content: space-between;
+}
+.flex-1{
+  flex:1,
+}
+.flex-2{
+  flex:2;
+}
 </style>

src/components/balanceAlert.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="content">
-    <el-radio-group v-if="deptBudgetList.warehouseName=='榆树库'" @change="radiochange" v-model="radio">
+    <!-- <el-radio-group v-if="deptBudgetList.warehouseName=='榆树库'" @change="radiochange" v-model="radio">
     <el-radio :label="1">大秤</el-radio>
     <el-radio :label="2">小秤</el-radio>
-  </el-radio-group>
-    <div class="title" v-if="information.indexOf('毛重') > -1">毛重</div>
-    <div class="title" v-else>皮重</div>
+  </el-radio-group> -->
+    <div class="title" v-if="information">{{information}}</div>
+    <div class="title" v-else></div>
     <div class="contentInfo">
       <div class="uncertain">浮动重量</div>
       <div class="number" v-if="information.indexOf('毛重') > -1">
@@ -13,6 +13,17 @@
       </div>
       <div class="number" v-else>{{ tareVal }} kg</div>
     </div>
+    <div class="contentInfo confirmWeight">
+      <div class="uncertain titleWeight">确认重量</div>
+      <div class="number weight" v-if="information.indexOf('毛重') > -1">
+        {{ grossWeightVal }} kg
+      </div>
+      <div class="number weight" v-else>{{ tareVal }} kg</div>
+    </div>
+    <div class="confirmInfo">
+      <div class="car-type">车牌号</div>
+      <div class="car-no"></div>
+    </div>
     <div class="btn" @click="sendVal">确定</div>
   </div>
 </template>
@@ -390,4 +401,20 @@ export default {
   text-align: right;
   margin-bottom: 20px;
 }
+.confirmWeight {
+        display: flex;
+        align-items: center;
+        .titleWeight {
+          width: 35%;
+          text-align: left;
+          line-height: 90px;
+          color: red;
+        }
+
+        .weight {
+          width: 65%;
+          text-align: right;
+          color: red;
+        }
+      }
 </style>

src/router/index.js

@@ -71,7 +71,6 @@ modulesFiles.keys().forEach((model_item, key) => {
     cofigRouter=cofigRouter.sort(function(a,b){
         return a.routesort - b.routesort
     })
-    console.log(2222,cofigRouter)
     // 需要根据用户角色动态加载的路由
 export const asyncRoutes = cofigRouter
 const createRouter = () =>

src/views/boundManagement/outbound.vue

@@ -1,53 +1,242 @@
 
 <template>
-    <div class="bg" id="index">
-      1发
+  <div class="bg" id="index">
+    <el-row class="row_top">
+      <el-col :span="12">
+        &nbsp;
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">保存</el-button>
+        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">新增</el-button>
+      </el-col>
+    </el-row>
+    <div class="enterTextWrap">
+      <div class="flex-1">
+        <div class="weign">
+          <BalanceAlert ref="weightChild" :deptBudgetList="form" :information="information"
+          v-on:balanceListen="setVal" class="zujian">
+        </BalanceAlert>
+          <!-- <div>{{weigntext?'':''}}</div>
+          <div></div>
+          <div></div> -->
+        </div>
+      </div>
+      <div class="flex-2 flex-justify-space-between">
+        <div class="form">
+          <el-form ref="form" :model="form" label-position="left" label-width="120px">
+            <div class="form-title">称重信息
+              <el-checkbox v-model="checked">手动编辑重量</el-checkbox>
+            </div>
+            <el-form-item label="毛重（公斤）">
+              <el-input :disabled="!checked" placeholder="输入毛重" v-model="form.name"></el-input>
+              <el-button type="text">获取</el-button>
+            </el-form-item>
+            <el-form-item label="皮重（公斤）">
+              <el-input :disabled="!checked" placeholder="输入皮重" v-model="form.name"></el-input>
+              <el-button type="text">获取</el-button>
+            </el-form-item>
+            <el-form-item label="净重（公斤）">
+              <el-input placeholder="自动计算" v-model="form.name"></el-input>
+            </el-form-item>
+            <div class="form-title">基本信息</div>
+            <el-form-item label="客户姓名">
+              <el-select placeholder="输入客户姓名" v-model="form.region" >
+                <el-option label="区域一" value="shanghai"></el-option>
+                <el-option label="区域二" value="beijing"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="车牌号">
+              <el-input placeholder="输入毛重车牌号" v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="仓位号">
+              <el-input placeholder="输入仓位号" v-model="form.name"></el-input>
+            </el-form-item>
+            <div class="form-title">定价信息</div>
+            <el-form-item label="单价（元/吨）">
+              <el-input placeholder="输入单价" v-model="form.desc"></el-input>
+            </el-form-item>
+            <el-form-item label="粮款（元）">
+              <el-input placeholder="自动计算" v-model="form.name"></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="form">
+          <el-form  ref="form" :model="form" label-position="left" label-width="120px">
+            <el-form-item label="货名">
+              <el-select placeholder="选择货名" v-model="form.region" >
+                <el-option label="区域一" value="shanghai"></el-option>
+                <el-option label="区域二" value="beijing"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="容重(克/升)">
+              <el-input placeholder="输入容重" v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="水分（%）">
+              <el-input placeholder="输入水分占比" v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="蛋白（%）">
+              <el-input placeholder="输入蛋白占比" v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="杂质（%）">
+              <el-input placeholder="输入杂质占比" v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="霉变粒（%）">
+              <el-input placeholder="输入霉变粒占比" v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="热损伤（%）">
+              <el-input placeholder="输入热损伤占比" v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="不完善粒（%）">
+              <el-input placeholder="输入不完善粒占比" v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="备注">
+              <el-input placeholder="输入备注，0-150个字" type="textarea" v-model="form.desc"></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
     </div>
-  </template>
-  
-  <script>
-  import {
-    gChartsData,
-  } from '@/model/home/index'
-  // import CenterMap from "./center-map.vue";
-  export default {
-    components: {
-    },
-    data() {
-      return {
-       
-      };
-    },
-    filters: {
-      numsFilter(msg) {
-        return msg || 0;
-      },
-    },
-    created() {
-    },
-    mounted() {
-     
-  
+    <div class="tableWrap">
+      <el-row class="row_top">
+        <el-col :span="12">
+          <el-date-picker value-format='yyyy-MM-dd' v-model="value" type="daterange" unlink-panels range-separator="至"
+              start-placeholder="开始日期" end-placeholder="结束日期" class="data_css" @change="changeDate" ></el-date-picker>
+          <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">全部</el-button>
+        </el-col>
+        <el-col :span="12" class="bg-right">
+          <el-input placeholder="可按客户、车牌号查找" class="input_css" v-model="searchKeyWord"></el-input>
+          <el-button class="find" type="primary" @click="find()"><img width="16" height="16" style="left: -8px;"
+                src="../../../public/img/sousuo.png" alt="" /></el-button>
+        </el-col>
+      </el-row>
+      <el-table :data="tableData" stripe style="width: 100%" @selection-change="handleSelectionChange">
+        <el-table-column  width="40">
+          <template scope="scope">
+            <img v-if="!scope.row.select" style='width:15px;vertical-align: text-top;' @click='radiochange1(index,scope.row,item)' src="../../../public/img/wxz.png" alt="">
+            <img v-if="scope.row.select" style='width:15px;vertical-align: text-top;' @click='radiochange(index,scope.row,item)' src="../../../public/img/xz.png" alt="">
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号">
+            <template scope="scope">
+              <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+              <span v-else>{{ scope.$index + 1 }}</span>
+            </template>
+        </el-table-column>
+        <el-table-column prop="contractNo" label="日期"></el-table-column>
+        <el-table-column prop="receivingCompany" label="仓位"></el-table-column>
+        <el-table-column prop="cumulativeTransfer" label="车牌号"></el-table-column>
+        <el-table-column prop="expectedRedemption" label="客户"></el-table-column>
+        <el-table-column width="120" prop="redeemed" label="货名"></el-table-column>
+        <el-table-column width="120" prop="settlementPrice" label="毛重（吨）"></el-table-column>
+        <el-table-column width="120" prop="settlementPrice" label="皮重（吨）"></el-table-column>
+        <el-table-column width="120" prop="settlementPrice" label="净重（吨）"></el-table-column>
+        <el-table-column width="120" prop="settlementPrice" label="容重（克/升）"></el-table-column>
+        <el-table-column width="120" prop="settlementPrice" label="水分（%）"></el-table-column>
+        <el-table-column width="120" prop="settlementPrice" label="单价（元/吨）"></el-table-column>
+        <el-table-column width="120" prop="settlementPrice" label="粮款（元）"></el-table-column>
+        <el-table-column width="120" prop="settlementPrice" label="付款状态"></el-table-column>
+        <el-table-column prop="address" label="操作" width="200">
+          <template slot-scope="scope">
+            <el-button type="text">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        style="text-align:center" :page-size="pageSize"
+        layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  gChartsData,
+} from '@/model/home/index'
+import BalanceAlert from '@/components/balanceAlert'
+// import CenterMap from "./center-map.vue";
+export default {
+  components: {
+    BalanceAlert,
+  },
+  data() {
+    return {
+      tableData:[],
+      form:{},
+      information:'',
+      checked:false
+    };
+  },
+  filters: {
+    numsFilter(msg) {
+      return msg || 0;
     },
-    beforeDestroy() {
+  },
+  created() {
+  },
+  mounted() {
    
-      
+
+  },
+  beforeDestroy() {
+ 
+    
+  },
+  methods: {
+    changeDate(){
+      if(this.value){
+        this.startDate = this.value[0]
+        this.endDate = this.value[1]
+      }else{
+        this.startDate = ''
+        this.endDate = ''
+      }
+      this.getList()
     },
-    methods: {
+    setVal(data) {
+      if (this.information == '毛重') {
+        this.form.grossWeight = data
+      } else {
+        this.form.tare = data
+      }
     },
-  };
-  </script>
-  <style lang="scss" scoped>
-  
-  .bg {
-    width: 100%;
-    height: 100%;
-    padding: 16px 16px 10px 16px;
-    box-sizing: border-box;
-    // background-image: url("../../assets/images/pageBg.png");
-    background-size: cover;
-    background-position: center center;
-  }
-  
-  </style>
-  
+  },
+};
+</script>
+<style lang="scss" scoped>
+
+.bg {
+  width: 100%;
+  height: 100%;
+  padding: 16px 16px 10px 16px;
+  box-sizing: border-box;
+  // background-image: url("../../assets/images/pageBg.png");
+  background-size: cover;
+  background-position: center center;
+}
+.enterTextWrap{
+  display: flex;
+  justify-content: space-between;
+}
+.form-title{
+  font-weight:600;
+  margin-bottom:10px;
+}
+.enterTextWrap .el-form .el-form-item__content .el-input,
+.enterTextWrap .el-form .el-form-item__content .el-select,
+/deep/.enterTextWrap .el-form .el-form-item__content .el-textarea .el-textarea__inner{
+ width:80%;
+}
+/deep/.form .el-form .el-form-item .el-form-item__label{
+  color:#8890b1;
+}
+.form{
+  flex:50%;
+}
+.row_top{
+  margin:10px 0;
+}
+.row_top .el-input,.row_top .el-date-editor{
+ width:50% !important;
+}
+</style>

src/views/warehousing/index.vue

@@ -1,13 +1,151 @@
-<!--
- * @Author: daidai
- * @Date: 2022-03-04 09:23:59
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2022-05-07 11:05:02
- * @FilePath: \web-pc\src\pages\big-screen\view\indexs\index.vue
--->
+
 <template>
   <div class="bg" id="index">
-    1发放是多少大复方丹参
+    <el-row class="row_top">
+      <el-col :span="12">
+        &nbsp;
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">保存</el-button>
+        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">新增</el-button>
+      </el-col>
+    </el-row>
+    <div class="enterTextWrap">
+      <div class="flex-1">
+        <div class="weign">
+          <BalanceAlert ref="weightChild" :deptBudgetList="form" :information="information"
+          v-on:balanceListen="setVal" class="zujian">
+        </BalanceAlert>
+          <!-- <div>{{weigntext?'':''}}</div>
+          <div></div>
+          <div></div> -->
+        </div>
+      </div>
+      <div class="flex-2 flex-justify-space-between">
+        <div class="form">
+          <el-form ref="form" :model="form" label-position="left" label-width="120px">
+            <div class="form-title">称重信息
+              <el-checkbox v-model="checked">手动编辑重量</el-checkbox>
+            </div>
+            <el-form-item label="毛重（公斤）">
+              <el-input :disabled="!checked" placeholder="输入毛重" v-model="form.name"></el-input>
+              <el-button type="text">获取</el-button>
+            </el-form-item>
+            <el-form-item label="皮重（公斤）">
+              <el-input :disabled="!checked" placeholder="输入皮重" v-model="form.name"></el-input>
+              <el-button type="text">获取</el-button>
+            </el-form-item>
+            <el-form-item label="净重（公斤）">
+              <el-input disabled placeholder="自动计算" v-model="form.name"></el-input>
+            </el-form-item>
+            <div class="form-title">基本信息</div>
+            <el-form-item label="客户姓名">
+              <el-select placeholder="输入客户姓名" v-model="form.region" >
+                <el-option label="区域一" value="shanghai"></el-option>
+                <el-option label="区域二" value="beijing"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="车牌号">
+              <el-input placeholder="输入毛重车牌号" v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="仓位号">
+              <el-input placeholder="输入仓位号" v-model="form.name"></el-input>
+            </el-form-item>
+            <div class="form-title">定价信息</div>
+            <el-form-item label="单价（元/吨）">
+              <el-input placeholder="输入单价" v-model="form.desc"></el-input>
+            </el-form-item>
+            <el-form-item label="粮款（元）">
+              <el-input placeholder="自动计算" v-model="form.name"></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="form">
+          <el-form  ref="form" :model="form" label-position="left" label-width="120px">
+            <el-form-item label="货名">
+              <el-select placeholder="选择货名" v-model="form.region" >
+                <el-option label="区域一" value="shanghai"></el-option>
+                <el-option label="区域二" value="beijing"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="容重(克/升)">
+              <el-input placeholder="输入容重" v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="水分（%）">
+              <el-input placeholder="输入水分占比" v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="蛋白（%）">
+              <el-input placeholder="输入蛋白占比" v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="杂质（%）">
+              <el-input placeholder="输入杂质占比" v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="霉变粒（%）">
+              <el-input placeholder="输入霉变粒占比" v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="热损伤（%）">
+              <el-input placeholder="输入热损伤占比" v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="不完善粒（%）">
+              <el-input placeholder="输入不完善粒占比" v-model="form.name"></el-input>
+            </el-form-item>
+            <el-form-item label="备注">
+              <el-input placeholder="输入备注，0-150个字" type="textarea" v-model="form.desc"></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+    </div>
+    <div class="tableWrap">
+      <el-row class="row_top">
+        <el-col :span="12">
+          <el-date-picker value-format='yyyy-MM-dd' v-model="value" type="daterange" unlink-panels range-separator="至"
+              start-placeholder="开始日期" end-placeholder="结束日期" class="data_css" @change="changeDate" ></el-date-picker>
+          <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">全部</el-button>
+        </el-col>
+        <el-col :span="12" class="bg-right">
+          <el-input placeholder="可按客户、车牌号查找" class="input_css" v-model="searchKeyWord"></el-input>
+          <el-button class="find" type="primary" @click="find()"><img width="16" height="16" style="left: -8px;"
+                src="../../../public/img/sousuo.png" alt="" /></el-button>
+        </el-col>
+      </el-row>
+      <el-table :data="tableData" stripe style="width: 100%" @selection-change="handleSelectionChange">
+        <el-table-column  width="40">
+          <template scope="scope">
+            <img v-if="!scope.row.select" style='width:15px;vertical-align: text-top;' @click='radiochange1(index,scope.row,item)' src="../../../public/img/wxz.png" alt="">
+            <img v-if="scope.row.select" style='width:15px;vertical-align: text-top;' @click='radiochange(index,scope.row,item)' src="../../../public/img/xz.png" alt="">
+          </template>
+        </el-table-column>
+        <el-table-column type="index" label="序号">
+            <template scope="scope">
+              <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+              <span v-else>{{ scope.$index + 1 }}</span>
+            </template>
+        </el-table-column>
+        <el-table-column prop="contractNo" label="日期"></el-table-column>
+        <el-table-column prop="receivingCompany" label="仓位"></el-table-column>
+        <el-table-column prop="cumulativeTransfer" label="车牌号"></el-table-column>
+        <el-table-column prop="expectedRedemption" label="客户"></el-table-column>
+        <el-table-column width="120" prop="redeemed" label="货名"></el-table-column>
+        <el-table-column width="120" prop="settlementPrice" label="毛重（吨）"></el-table-column>
+        <el-table-column width="120" prop="settlementPrice" label="皮重（吨）"></el-table-column>
+        <el-table-column width="120" prop="settlementPrice" label="净重（吨）"></el-table-column>
+        <el-table-column width="120" prop="settlementPrice" label="容重（克/升）"></el-table-column>
+        <el-table-column width="120" prop="settlementPrice" label="水分（%）"></el-table-column>
+        <el-table-column width="120" prop="settlementPrice" label="单价（元/吨）"></el-table-column>
+        <el-table-column width="120" prop="settlementPrice" label="粮款（元）"></el-table-column>
+        <el-table-column width="120" prop="settlementPrice" label="付款状态"></el-table-column>
+        <el-table-column prop="address" label="操作" width="200">
+          <template slot-scope="scope">
+            <el-button type="text">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        style="text-align:center" :page-size="pageSize"
+        layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+      </el-pagination>
+    </div>
   </div>
 </template>
 
@@ -15,13 +153,18 @@
 import {
   gChartsData,
 } from '@/model/home/index'
+import BalanceAlert from '@/components/balanceAlert'
 // import CenterMap from "./center-map.vue";
 export default {
   components: {
+    BalanceAlert,
   },
   data() {
     return {
-     
+      tableData:[],
+      form:{},
+      information:'',
+      checked:false
     };
   },
   filters: {
@@ -40,6 +183,23 @@ export default {
     
   },
   methods: {
+    changeDate(){
+      if(this.value){
+        this.startDate = this.value[0]
+        this.endDate = this.value[1]
+      }else{
+        this.startDate = ''
+        this.endDate = ''
+      }
+      this.getList()
+    },
+    setVal(data) {
+      if (this.information == '毛重') {
+        this.form.grossWeight = data
+      } else {
+        this.form.tare = data
+      }
+    },
   },
 };
 </script>
@@ -54,5 +214,29 @@ export default {
   background-size: cover;
   background-position: center center;
 }
-
+.enterTextWrap{
+  display: flex;
+  justify-content: space-between;
+}
+.form-title{
+  font-weight:600;
+  margin-bottom:10px;
+}
+.enterTextWrap .el-form .el-form-item__content .el-input,
+.enterTextWrap .el-form .el-form-item__content .el-select,
+/deep/.enterTextWrap .el-form .el-form-item__content .el-textarea .el-textarea__inner{
+ width:80%;
+}
+/deep/.form .el-form .el-form-item .el-form-item__label{
+  color:#8890b1;
+}
+.form{
+  flex:50%;
+}
+.row_top{
+  margin:10px 0;
+}
+.row_top .el-input,.row_top .el-date-editor{
+ width:50% !important;
+}
 </style>