zhongtianhaoyuan 3 vuotta sitten
vanhempi
commit
e7b9767467

+ 6 - 4
src/lang/zh.js

@@ -983,11 +983,12 @@
 
     // 库内自采
     customerManagement:'客户管理',
-    acquisitionManagement:'收购管理',
+    acquisitionManagement:'仓库设置',
     inspectionManagement:'质检管理',
     paymentManagement:'付款管理',
     weighingManagement:'检斤管理',
-    houseSelfCollect:"库内自采"
+    houseSelfCollect:"库内自采",
+    houseSelfCollectPrint:"查看"
   },
   // 后台错误码
   message: {
@@ -7402,11 +7403,12 @@
   //库内自采
   houseSelfCollect:{
     customerManagement:'客户管理',
-    acquisitionManagement:'收购管理',
+    acquisitionManagement:'仓库设置',
     inspectionManagement:'质检管理',
     paymentManagement:'付款管理',
     weighingManagement:'检斤管理',
-    houseSelfCollect:"库内自采"
+    houseSelfCollect:"库内自采",
+    houseSelfCollectPrint:"查看"
   }
   
 }

+ 15 - 0
src/views/houseSelfCollect/component/routers/route.js

@@ -82,6 +82,21 @@ const houseSelfCollectRouter = {
         keepAlive: true
       }
     },
+    //打印
+    {
+      path: 'houseSelfCollectPrint',
+      component: () =>
+        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/houseSelfCollectPrint'),
+      name: 'houseSelfCollectPrint',
+      meta: {
+        title: 'houseSelfCollectPrint',
+        shortcutEntrance: 'houseSelfCollectPrint',
+        module: 'procurement.procurementOrder.delete',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
   ],
 
 };

+ 50 - 0
src/views/houseSelfCollect/houseSelfCollectPrint.vue

@@ -0,0 +1,50 @@
+<!--打印-->
+<template>
+  <div id="print" class="center">
+   <div class="title">中天昊元粮食贸易有限公司结算凭证</div>
+   
+  </div>
+</template>
+<script>
+import {
+  // getList,
+} from '@/model/houseSelfCollect/index'
+
+export default {
+
+  components: {
+
+  },
+  watch: {
+
+  },
+  data() {
+    return {
+      tableData:{},
+ 
+    }
+  },
+  activated() {
+
+  },
+  methods: {
+
+  },
+}
+</script>
+<style lang="scss" scoped>
+.center{
+  width: 90%;
+  border: 1px solid #D8DCE6;
+  margin: 10px auto;
+}
+.title{
+    width: 325px;
+    font-size: 20px;
+    margin: 10px auto;
+    text-align: center;
+    color: #323233;
+    font-weight: 600;
+    border-bottom-style: double ;
+}
+</style>

+ 268 - 2
src/views/houseSelfCollect/inspectionManagement.vue

@@ -1,7 +1,187 @@
 <!--质检管理-->
 <template>
   <div>
-   质检管理
+     <BaseHeaderLayout :leftSpan="12">
+      <template slot="left"> 
+         <ws-button type="primary" @click="add">添加</ws-button>
+      </template>
+      <template slot="right">
+        <ws-select
+          v-model="searchTypeText"
+          placeholder=""
+          @change="selecttaskType"
+          :value="searchType"
+        >
+          <ws-option
+            v-for="item in taskTypeList"
+            :key="item.value"
+            :label="item.value"
+            :value="item.value"
+            style="color: #8890b1"
+          />
+        </ws-select>
+        <div></div>
+        <ws-input
+          v-model="searchKeyWord"
+          placeholder="可按编号、客户名、车牌号查找"
+          clearable
+          maxlength="500"
+          type="input"
+        ></ws-input>
+        <ws-button class="find" type="primary" @click="find()"
+          ><img
+            width="16"
+            height="16"
+            style="
+              vertical-align: text-top;
+              position: relative;
+              top: 0px;
+              left: -8px;
+            "
+            src="../../../public/img/sousuo.png"
+            alt=""
+        /></ws-button>
+      </template>
+    </BaseHeaderLayout>
+    <el-table
+      :data="warehouseList"
+      style="width: 100%; margin-top: 20px"
+      ref="warehouseList"
+      border
+    >
+      <el-table-column type="index" label="序号" width="50"></el-table-column>
+      <el-table-column
+        prop="contractNo"
+        width="120"
+        label="编号"
+      ></el-table-column>
+      <el-table-column prop="contractNo" label="客户"></el-table-column>
+      <el-table-column prop="contractNo" label="车牌号"></el-table-column>
+      <el-table-column prop="contractNo" label="货名"></el-table-column>
+       <el-table-column prop="contractNo" label="水分(%)"></el-table-column>
+      <el-table-column prop="contractNo" label="净重单价(元/公斤)"></el-table-column>
+      <el-table-column prop="contractNo" label="仓位号"></el-table-column>
+      <el-table-column prop="contractNo" label="囤位号"></el-table-column>
+      <el-table-column prop="contractNo" label="质检员"></el-table-column>
+      <el-table-column prop="contractNo" label="质检时间"></el-table-column>
+      <el-table-column prop="contractNo" label="状态"></el-table-column>
+      <el-table-column width="300" prop="contractNo1" label="操作">
+        <el-button @click="look">查看</el-button>
+        <el-button @click="edit">编辑</el-button>
+        <el-button @click="del">删除</el-button>
+      </el-table-column>
+    </el-table>
+    <!-- 添加编辑 -->
+    <el-dialog width="40%" :visible.sync="paymentForm" :append-to-body="true">
+      <ws-form>
+        <div class="title">{{switchchange}}自检信息</div>
+         <div class="tit">基本信息</div>
+        <ws-info-table>
+          <ws-form-item label="编号" prop="waterContent">
+            <ws-input placeholder="请输入编号" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item label="仓位号" prop="waterContent">
+            <ws-select
+              v-model="warehouseList.a"
+              placeholder="请输入仓位号"
+              class="typeselect"
+              @change="selectpackingMethod"
+              :disabled = "disabled"
+            >
+              <ws-option 
+                v-for="item in goodnameList"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+            </ws-select>
+          </ws-form-item>
+          <ws-form-item label="客户" prop="waterContent">
+             <ws-select
+              v-model="warehouseList.a"
+              placeholder="请输入客户"
+              class="typeselect"
+              @change="selectpackingMethod"
+               :disabled = "disabled"
+            >
+              <ws-option
+                v-for="item in goodnameList"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+             </ws-select>
+          </ws-form-item>
+          <ws-form-item label="囤位号" prop="waterContent">
+            <ws-input placeholder="请输入囤位号" maxlength="100"  :disabled = "disabled" size="small" />
+          </ws-form-item>
+          <ws-form-item label="车牌号" prop="waterContent">
+            <ws-input placeholder="请输入车牌号" maxlength="100"  :disabled = "disabled" size="small" />
+          </ws-form-item>
+          <ws-form-item label="货名" prop="waterContent">
+             <ws-select
+              v-model="warehouseList.a"
+              placeholder="请输入货名"
+              class="typeselect"
+              @change="selectpackingMethod"
+               :disabled = "disabled"
+            >
+              <ws-option
+                v-for="item in goodnameList"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+             </ws-select>
+          </ws-form-item>
+          <ws-form-item label="扣重比" prop="waterContent">
+            <ws-input placeholder="请输入扣重比" maxlength="100"  :disabled = "disabled" size="small" />
+          </ws-form-item>
+        </ws-info-table>
+          <div class="tit">质检数据</div>
+         <ws-info-table>
+          <ws-form-item label="等级" prop="waterContent">
+              <ws-select
+              v-model="warehouseList.a"
+              placeholder="请输入货名"
+              class="typeselect"
+              @change="selectpackingMethod"
+               :disabled = "disabled"
+            >
+              <ws-option
+                v-for="item in goodnameList"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              />
+             </ws-select>
+          </ws-form-item>
+          <ws-form-item label="杂质(%)" prop="waterContent">
+            <ws-input placeholder="请输入杂质" maxlength="100"  :disabled = "disabled" size="small" />
+          </ws-form-item>
+          <ws-form-item label="水分(%)" prop="waterContent">
+            <ws-input placeholder="请输入水分" maxlength="100"  :disabled = "disabled" size="small" />
+          </ws-form-item>
+          <ws-form-item label="霉变粒(%)" prop="waterContent">
+            <ws-input placeholder="请输入霉变粒" maxlength="100"  :disabled = "disabled" size="small" />
+          </ws-form-item>
+          <ws-form-item label="容重(克/升)" prop="waterContent">
+            <ws-input placeholder="请输入容重" maxlength="100"  :disabled = "disabled" size="small" />
+          </ws-form-item>
+          <ws-form-item label="热损伤(%)" prop="waterContent">
+            <ws-input placeholder="请输入热损伤" maxlength="100"  :disabled = "disabled" size="small" />
+          </ws-form-item>
+          <ws-form-item label="不完整粒(%)" prop="waterContent">
+            <ws-input placeholder="请输入不完整粒" maxlength="100"  :disabled = "disabled" size="small" />
+          </ws-form-item>
+        </ws-info-table>
+        <div style="text-align: center">
+          <el-button @click="paymentForm = false" v-if="disabled == false">取消</el-button>
+          <el-button @click="commit" v-if="disabled == false">保存</el-button>
+          <el-button @click="paymentForm = false" v-if="disabled == true">关闭</el-button>
+        </div>
+      </ws-form>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -19,16 +199,102 @@ export default {
   },
   data() {
     return {
- 
+      searchKeyWord:"",
+      taskTypeList:[],
+      searchType:"", 
+      searchTypeText:"",
+      warehouseList:[{
+        contractNo:"快付款",
+      }],
+      paymentForm:false,
+      switchchange:"",
+      disabled:false,
     }
   },
   activated() {
 
   },
   methods: {
+    add(){//添加
+    this.switchchange = "添加"
+    this.paymentForm = true
+      this.disabled = false
+
+    },
+    selecttaskType(){
+
+    },
+    del(){//删除
+     this.$confirm('确定删除质检信息?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {})
+        .catch(() => {
+          return false
+        })
+
+    },
+    edit(){ //编辑
+     this.switchchange = "编辑"
+    this.paymentForm = true
+    this.disabled = false
+    },
+    look(){//查看
+     this.switchchange = "查看"
+    this.paymentForm = true
+    this.disabled = true
+
+    },
+    commit(){//保存
+     this.$confirm('确定保存质检信息?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {})
+        .catch(() => {
+          return false
+        })
+
+    }
 
   },
 }
 </script>
 <style lang="scss" scoped>
+.title {
+  font-size: 20px;
+  font-weight: 600;
+  margin: 20px 0 0 20px;
+}
+.tit{
+  font-size: 16px;
+  font-weight: 600;
+  margin: 20px;
+}
+.ws-info-table {
+  border: none;
+}
+.ws-info-table .el-form-item {
+  width: 50%;
+  border: none;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 30%;
+  text-align: center;
+  background: #ffffff;
+  color: #8890b1;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  border: none;
+}
+/deep/.el-table .el-table__header .cell,
+.el-table .el-table__body .cell {
+  text-align: center;
+}
+/deep/.el-table--enable-row-transition .el-table__body td {
+  text-align: center;
+}
 </style>

+ 704 - 14
src/views/houseSelfCollect/paymentManagement.vue

@@ -1,34 +1,724 @@
 <!--客户管理-->
 <template>
   <div>
-   付款管理
+    <BaseHeaderLayout :leftSpan="12">
+      <template slot="left">
+        <ws-button type="primary">待结算</ws-button>
+        <ws-button type="primary">待审核</ws-button>
+        <ws-button type="primary">全部</ws-button>
+        <ws-button type="primary" @click="reject">驳回</ws-button>
+        <ws-button type="primary" @click="adopt">通过</ws-button>
+        <ws-button type="primary" @click="payment">付款</ws-button>
+        <ws-button type="primary" @click="examine">审核</ws-button>
+      </template>
+      <template slot="right">
+        <ws-select
+          v-model="searchTypeText"
+          placeholder=""
+          @change="selecttaskType"
+          :value="searchType"
+        >
+          <ws-option
+            v-for="item in taskTypeList"
+            :key="item.value"
+            :label="item.value"
+            :value="item.value"
+            style="color: #8890b1"
+          />
+        </ws-select>
+        <div></div>
+        <ws-input
+          v-model="searchKeyWord"
+          placeholder="可按编号、客户名、车牌号查找"
+          clearable
+          maxlength="500" 
+          type="input"
+        ></ws-input>
+        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
+        <ws-button class="find" type="primary" @click="find()"
+          ><img
+            width="16"
+            height="16"
+            style="
+              vertical-align: text-top;
+              position: relative;
+              top: 0px;
+              left: -8px;
+            "
+            src="../../../public/img/sousuo.png"
+            alt=""
+        /></ws-button>
+      </template>
+    </BaseHeaderLayout>
+    <el-table
+      class="wenzi"
+      :data="warehouseList"
+      style="width: 100%; margin-top: 20px"
+      ref="warehouseList"
+      border
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column
+        :selectable="selectInit"
+        type="selection"
+        width="55"
+      ></el-table-column>
+      <el-table-column type="index" label="序号" width="50"></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="contractNo"
+        width="120"
+        label="编号"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="closePositionDate"
+        label="客户"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="closingQuantity"
+        label="车牌号"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="transactionPrice"
+        label="货名"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="closeRate"
+        label="净重单价(元/公斤)"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="basisPrice"
+        label="纯重单价(元/公斤)"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="amountIngPayable"
+        label="净重(公斤)"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="amountEdPayable"
+        label="纯重(公斤)"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="amountNotPayable"
+        label="应付款(元)"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="paymentDate"
+        label="已付款(元)"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="collectionIngPayable"
+        label="更新时间"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="collectionEdPayable"
+        label="状态"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="collectionEdPayable"
+        label="操作"
+        width="350"
+      >
+        <el-button @click="del">删除</el-button>
+        <el-button @click="settlement">结算</el-button>
+        <el-button @click="settlement">查看</el-button>
+        <el-button>打印</el-button>
+      </el-table-column>
+    </el-table>
+    <!-- 查看结算弹窗 -->
+    <!--startprint-->
+    <el-dialog width="60%" :visible.sync="dialogForm" :append-to-body="true">
+      <div id="print">
+        <template>
+          <ws-form>
+            <div style="width: 60%; margin: 0 auto">
+              <div class="title">基本信息</div>
+              <ws-info-table>
+                <ws-form-item label="编号" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入编号"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="仓位号" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入仓位号"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="客户" span="1" prop="waterContent">
+                  <!-- <ws-input
+                  placeholder="请输入客户"
+                  maxlength="100"
+                  size="small"
+                /> -->
+                  <ws-select
+                    v-model="warehouseList.a"
+                    placeholder="请输入货名"
+                    class="typeselect"
+                    @change="selectpackingMethod"
+                  >
+                    <ws-option
+                      v-for="item in goodnameList"
+                      :key="item.constKey"
+                      :label="item.constValue"
+                      :value="item.constValue"
+                    />
+                  </ws-select>
+                </ws-form-item>
+                <ws-form-item label="囤位号" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入客户"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="车牌号" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入客户"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="货名" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入客户"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+              </ws-info-table>
+
+              <div class="title">质检数据</div>
+              <ws-info-table>
+                <ws-form-item label="等级" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入编号"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="杂质(%)" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入杂质占比"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="水分(%)" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入水分占比"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="霉变粒(%)" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入霉变粒占比"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item
+                  label="容重(克/升)"
+                  span="1"
+                  prop="waterContent"
+                >
+                  <ws-input
+                    placeholder="请输入容重"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="热损伤(%)" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入热损伤占比"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item
+                  label="不完整粒(%)"
+                  span="1"
+                  prop="waterContent"
+                >
+                  <ws-input
+                    placeholder="请输入不完整粒占比"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+              </ws-info-table>
+
+              <div class="title">单价核算</div>
+              <ws-info-table>
+                <ws-form-item
+                  label="潮粮水分(%)"
+                  span="1"
+                  prop="waterContent"
+                >
+                  <ws-input
+                    placeholder="请输入潮粮水分"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="扣重比" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入扣重比"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item
+                  label="干粮水分(%)"
+                  span="1"
+                  prop="waterContent"
+                >
+                  <ws-input
+                    placeholder="请输入干粮水分"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="扣重" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入扣重"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="掉水(%)" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入掉水"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="基数" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入基数"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="毛重(公斤)" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入毛重"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="纯重(公斤)" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入纯重"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="皮重(公斤)" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入皮重"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item
+                  label="净重单价(元/公斤)"
+                  span="1"
+                  prop="waterContent"
+                >
+                  <ws-input
+                    placeholder="请输入净重单价"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="扣杂(公斤)" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入扣杂"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item
+                  label="纯重单价(元/公斤)"
+                  span="1"
+                  prop="waterContent"
+                >
+                  <ws-input
+                    placeholder="请输入纯重单价"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="净重(公斤)" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入净重"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+              </ws-info-table>
+
+              <div class="title">核算金额(元)</div>
+              <ws-info-table>
+                <ws-form-item
+                  label="粮款 = 净重 x 净重单价 ="
+                  span="1"
+                  prop="waterContent"
+                  class="formItem"
+                >
+                  <ws-input
+                    placeholder="请输入粮款"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="称重补助" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入称重补助"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="运费补助" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入运费补助"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="运费扣款" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入运费扣款"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="卸车补助" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入卸车补助"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="卸车扣款" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入卸车扣款"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="其他补助" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入其他补助"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="其他扣款" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入其他扣款"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item
+                  label="计算应付 = 粮款 + 补助- 扣款 ="
+                  span="1"
+                  prop="waterContent"
+                  class="formItem"
+                >
+                  <ws-input
+                    placeholder="请输入计算应付"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="实际付款" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入实际付款"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="人民币大写" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入人民币大写"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item
+                  label="纯重单价(元/公斤)"
+                  span="1"
+                  prop="waterContent"
+                >
+                  <ws-input
+                    placeholder="请输入纯重单价"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+                <ws-form-item label="记事(选填)" span="1" prop="waterContent">
+                  <ws-input
+                    placeholder="请输入记事(选填)"
+                    maxlength="100"
+                    size="small"
+                  />
+                </ws-form-item>
+              </ws-info-table>
+            </div>
+            <div style="text-align: center">
+              <el-button>取消</el-button>
+              <el-button @click="print">保存并打印</el-button>
+            </div>
+          </ws-form>
+        </template>
+      </div>
+    </el-dialog>
+    <!--endprint-->
+    <!-- 付款弹窗 -->
+    <el-dialog width="40%" :visible.sync="paymentForm" :append-to-body="true">
+      <ws-form>
+        <ws-info-table>
+          <ws-form-item label="未付金额(元)" prop="waterContent">
+            <ws-input
+              placeholder="请输入未付金额(元)"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
+          <ws-form-item label="本次付款金额(元)" prop="waterContent">
+            <ws-input
+              placeholder="请输入本次付款金额(元)"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
+          <ws-form-item label="付款日期" prop="waterContent">
+            <el-date-picker v-model="value1" type="date" placeholder="选择日期">
+            </el-date-picker>
+          </ws-form-item>
+        </ws-info-table>
+        <div style="text-align: center">
+          <el-button @click="paymentForm = false">取消</el-button>
+          <el-button @click="paymentSubmit">提交</el-button>
+        </div>
+      </ws-form>
+    </el-dialog>
+    <houseSelfCollectPrint v-show="false"></houseSelfCollectPrint>
   </div>
 </template>
 <script>
-import {
-  // getList,
-} from '@/model/houseSelfCollect/index'
+import {} from '@/model/houseSelfCollect/index'
+import houseSelfCollectPrint from './houseSelfCollectPrint.vue'
 
 export default {
-
   components: {
-
-  },
-  watch: {
-
+    houseSelfCollectPrint
   },
+  watch: {},
   data() {
     return {
- 
+      warehouseList: [
+        {
+          collectionEdPayable: '快付款',
+        },
+      ],
+      dialogForm: false,
+      paymentForm: false,
+      taskTypeList: ['一号库'],
+      searchType: '',
+      searchTypeText: '',
+      searchKeyWord: '',
+      value1: '', //付款日期
+      modification:[],
     }
   },
-  activated() {
-
-  },
+  activated() {},
   methods: {
+    del() {
+      this.$confirm(
+        '对应的质检和检斤记录将一并删除,是否确定删除操作?',
+        '提示',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }
+      )
+        .then(() => {})
+        .catch(() => {
+          return false
+        })
+    },
+    settlement() {
+      this.dialogForm = true
+    },
+    payment() {
+      if(this.modification.length == 0){
+         this.$message.warning('请选择要付款的条目')
+      }else{
+        this.paymentForm = true
+      }
+    },
+    paymentSubmit(){
+      this.$confirm(
+        '确定提交付款信息?',
+        '提示',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        })
+        .then(() => {})
+        .catch(() => {
+          return false
+        })
+    },
+    reject(){
+        if(this.modification.length == 0){
+         this.$message.warning('请选择要驳回的条目')
+      }else{
+        this.$confirm(
+        '驳回后任务将退回到统计,是否确定驳回?',
+        '提示',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        })
+        .then(() => {})
+        .catch(() => {
+          return false
+        })
+      }
+    },
+     adopt(){
+        if(this.modification.length == 0){
+         this.$message.warning('请选择要通过的条目')
+        }else{
+        this.$confirm(
+        '审核通过后,任务将发送给决策人,是否确定通过?',
+        '提示',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        })
+        .then(() => {})
+        .catch(() => {
+          return false
+        })
+      }
+    },
+    examine(){
+       if(this.modification.length == 0){
+         this.$message.warning('请选择要审核的条目')
+      }else{
+        this.$confirm(
+        '审核通过后,任务将发送给财务,是否确定通过?',
+        '提示',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        })
+        .then(() => {})
+        .catch(() => {
+          return false
+        })
+      }
+    },
+    print(){
+      // this.xx = true;
 
-  },
+      let newstr = document.getElementById("print").innerHTML;
+      let oldstr = document.body.innerHTML;
+      document.body.innerHTML = newstr;
+      window.print();
+      document.body.innerHTML = oldstr;
+      // window.location.reload()
+       this.$router.push({ path: 'paymentManagement' })
+    },
+    selectInit(row) {
+      //在这里一定要记得类型匹配的上。
+      if (row.approveStatus == null) {
+        return true
+      } else if (row.approveStatus != null) {
+        if (row.taskId == null) {
+          return false
+        } else {
+          return true
+        }
+      }
+    },
+     handleSelectionChange(val) {
+      this.modification = val
+    },
+    // handleRowClick(row) {
+    //   if (row.approveStatus == null) {
+    //     this.$refs.warehouseList.toggleRowSelection(row)
+    //     return true
+    //   } else if (row.approveStatus != null) {
+    //     if (row.taskId == null) {
+    //       return false
+    //     } else {
+    //       this.$refs.warehouseList.toggleRowSelection(row)
+    //       return true
+    //     }
+    //   }
+    // },
+    selecttaskType() {}
+  } 
 }
 </script>
 <style lang="scss" scoped>
+.ws-info-table {
+  border: none;
+}
+.ws-info-table .el-form-item {
+  width: 50%;
+  border: none;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 30%;
+  text-align: center;
+  background: #ffffff;
+  color: #8890b1;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  border: none;
+}
+.title {
+  font-size: 16px;
+  font-weight: 600;
+}
+.formItem {
+  width: 70% !important;
+}
+/deep/.el-table .el-table__header .cell,
+.el-table .el-table__body .cell {
+  text-align: center;
+}
+/deep/.el-table--enable-row-transition .el-table__body td {
+  text-align: center;
+}
 </style>
+

+ 258 - 15
src/views/houseSelfCollect/weighingManagement.vue

@@ -1,34 +1,277 @@
 <!--检斤管理-->
 <template>
   <div>
-   检斤管理
+    <BaseHeaderLayout :leftSpan="12">
+      <template slot="left"> </template>
+      <template slot="right">
+        <ws-select
+          v-model="searchTypeText"
+          placeholder=""
+          @change="selecttaskType"
+          :value="searchType"
+        >
+          <ws-option
+            v-for="item in taskTypeList"
+            :key="item.value"
+            :label="item.value"
+            :value="item.value"
+            style="color: #8890b1"
+          />
+        </ws-select>
+        <div></div>
+        <ws-input
+          v-model="searchKeyWord"
+          placeholder="可按编号、客户名、车牌号查找"
+          clearable
+          maxlength="500"
+          type="input"
+        ></ws-input>
+        <ws-button class="find" type="primary" @click="find()"
+          ><img
+            width="16"
+            height="16"
+            style="
+              vertical-align: text-top;
+              position: relative;
+              top: 0px;
+              left: -8px;
+            "
+            src="../../../public/img/sousuo.png"
+            alt=""
+        /></ws-button>
+      </template>
+    </BaseHeaderLayout>
+    <el-table
+      :data="warehouseList"
+      style="width: 100%; margin-top: 20px"
+      ref="warehouseList"
+      border
+    >
+      <el-table-column type="index" label="序号" width="50"></el-table-column>
+      <el-table-column
+        prop="contractNo"
+        width="120"
+        label="编号"
+      ></el-table-column>
+      <el-table-column prop="contractNo" label="客户"></el-table-column>
+      <el-table-column prop="contractNo" label="车牌号"></el-table-column>
+      <el-table-column prop="contractNo" label="货名"></el-table-column>
+
+      <el-table-column prop="contractNo" label="毛重(公斤)"></el-table-column>
+      <el-table-column prop="contractNo" label="皮重(公斤)"></el-table-column>
+      <el-table-column prop="contractNo" label="仓位号"></el-table-column>
+      <el-table-column prop="contractNo" label="囤位号"></el-table-column>
+      <el-table-column prop="contractNo" label="司称员"></el-table-column>
+      <el-table-column prop="contractNo" label="称重时间"></el-table-column>
+      <el-table-column prop="contractNo" label="状态"></el-table-column>
+      <el-table-column width="300" prop="contractNo1" label="操作">
+        <el-button @click="GrossWeight">毛重</el-button>
+        <el-button @click="tare">皮重</el-button>
+        <el-button @click="print">打印</el-button>
+      </el-table-column>
+    </el-table>
+
+    <!-- 毛重检斤 -->
+    <el-dialog width="40%" :visible.sync="paymentForm" :append-to-body="true">
+      <ws-form>
+        <div class="title">毛重检斤</div>
+        <ws-info-table>
+          <ws-form-item label="编号"  prop="waterContent">
+            <ws-input placeholder="请输入编号" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item label="仓位号" prop="waterContent">
+            <ws-input placeholder="请输入仓位号" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item label="客户" prop="waterContent">
+            <ws-input placeholder="请输入客户" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item label="囤位号" prop="waterContent">
+            <ws-input placeholder="请输入囤位号" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item label="车牌号" prop="waterContent">
+            <ws-input placeholder="请输入车牌号" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item label="货名" prop="waterContent">
+            <ws-input placeholder="请输入货名" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item label="毛重(公斤)" prop="waterContent">
+            <ws-input placeholder="请输入毛重" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <div><el-button @click="Reacquire">重新获取</el-button></div>
+        </ws-info-table>
+        <div style="text-align: center">
+          <el-button @click="paymentForm = false">取消</el-button>
+          <el-button @click="commit">保存</el-button>
+        </div>
+      </ws-form>
+    </el-dialog>
+    <!-- 皮重检斤 -->
+    <el-dialog width="40%" :visible.sync="paymentForm1" :append-to-body="true">
+      <ws-form>
+        <div class="title">皮重检斤</div>
+        <ws-info-table>
+          <ws-form-item label="编号" prop="waterContent">
+            <ws-input placeholder="请输入编号" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item label="仓位号" prop="waterContent">
+            <ws-input placeholder="请输入仓位号" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item label="客户" prop="waterContent">
+            <ws-input placeholder="请输入客户" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item label="囤位号" prop="waterContent">
+            <ws-input placeholder="请输入囤位号" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item label="车牌号" prop="waterContent">
+            <ws-input placeholder="请输入车牌号" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item label="货名" prop="waterContent">
+            <ws-input placeholder="请输入货名" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item
+            label="毛重(公斤)"
+            prop="waterContent"
+            class="formItem"
+          >
+            <ws-input placeholder="请输入毛重" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item
+            label="皮重(公斤)"
+            prop="waterContent"
+            class="formItem"
+          >
+            <ws-input placeholder="请输入皮重" maxlength="100" size="small" />
+            <el-button @click="Reacquire">重新获取</el-button>
+          </ws-form-item>
+          <ws-form-item
+            label="扣杂(公斤)"
+            prop="waterContent"
+            class="formItem"
+          >
+            <ws-input placeholder="请输入扣杂" maxlength="100" size="small" />
+          </ws-form-item>
+          <ws-form-item
+            label="净重(公斤)"
+            prop="waterContent"
+            class="formItem"
+          >
+            <ws-input placeholder="请输入净重" maxlength="100" disabled size="small" />
+          </ws-form-item>
+        </ws-info-table>
+        <div style="text-align: center">
+          <el-button @click="paymentForm1 = false">取消</el-button>
+          <el-button @click="submit">保存</el-button>
+        </div>
+      </ws-form>
+    </el-dialog>
+    <houseSelfCollectPrint v-show="false"></houseSelfCollectPrint>
   </div>
 </template>
 <script>
-import {
-  // getList,
-} from '@/model/houseSelfCollect/index'
-
+import houseSelfCollectPrint from './houseSelfCollectPrint.vue'
+import {} from '@/model/houseSelfCollect/index'
 export default {
-
   components: {
-
-  },
-  watch: {
-
+    houseSelfCollectPrint,
   },
+  watch: {},
   data() {
     return {
- 
+      paymentForm: false,
+      paymentForm1: false,
+      warehouseList: [
+        {
+          contractNo: '56454',
+        },
+      ],
+      searchKeyWord: '',
+      searchType: [],
+      searchTypeText: '',
+      value1: '', //选择时间
+      taskTypeList: [],
     }
   },
-  activated() {
-
-  },
+  activated() {},
   methods: {
-
+    GrossWeight() {
+      //毛重
+      this.paymentForm = true
+    },
+    tare() {
+      //皮重
+      this.paymentForm1 = true
+    },
+    selecttaskType() {
+      //选择仓库改变方法
+    },
+    Reacquire() {
+      //重新获取
+    },
+    commit() {
+      //毛重保存
+      this.$confirm('确定保存检斤信息?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {})
+        .catch(() => {
+          return false
+        })
+    },
+    submit() {//皮重保存
+       this.$confirm('确定保存检斤信息?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {})
+        .catch(() => {
+          return false
+        })
+    },
+    print() {
+      let newstr = document.getElementById('print').innerHTML
+      let oldstr = document.body.innerHTML
+      document.body.innerHTML = newstr
+      window.print()
+      document.body.innerHTML = oldstr
+      // window.location.reload()
+      this.$router.push({ path: 'paymentManagement' })
+    },
   },
 }
 </script>
 <style lang="scss" scoped>
+.title {
+  font-size: 20px;
+  font-weight: 600;
+  margin: 20px;
+}
+.ws-info-table {
+  border: none;
+}
+.ws-info-table .el-form-item {
+  width: 50%;
+  border: none;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 30%;
+  text-align: center;
+  background: #ffffff;
+  color: #8890b1;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  border: none;
+}
+/deep/.el-table .el-table__header .cell,
+.el-table .el-table__body .cell {
+  text-align: center;
+}
+/deep/.el-table--enable-row-transition .el-table__body td {
+  text-align: center;
+}
+.formItem {
+  width: 51% !important;
+}
 </style>