前端 sdy

src/lang/zh.js

@@ -982,18 +982,19 @@
     dynamicReportsDetail: '动态报详情',
 
     // 库内自采
-    houseSelfCollect:"库内自采",
+    houseSelfCollect:'收购业务管理',
     customerManagement:'客户管理',
     acquisitionManagement:'仓库设置',
     inspectionManagement:'质检管理',
     paymentManagement:'付款管理',
     weighingManagement:'检斤管理',
-    houseSelfCollectPrint:"查看",
+    houseSelfCollectPrint:'查看',
     acquisitionManagementAdd:'收购管理新增',
     acquisitionManagementEdit:'收购管理编辑',
-    customerManagementEdit:"客户管理编辑",
-    customerManagementAdd:"客户管理添加",
-    settlement:"结算"
+    customerManagementEdit:'客户管理编辑',
+    customerManagementAdd:'客户管理添加',
+    settlement:'结算',
+    inspectInfo:'质检信息'
   },
   // 后台错误码
   message: {
@@ -7414,11 +7415,12 @@
     inspectionManagement:'质检管理',
     paymentManagement:'付款管理',
     weighingManagement:'检斤管理',
-    houseSelfCollect:"库内自采",
-    houseSelfCollectPrint:"查看",
-    customerManagementEdit:"客户管理编辑",
-    customerManagementAdd:"客户管理添加",
-    settlement:"结算"
+    houseSelfCollect:'收购业务管理',
+    houseSelfCollectPrint:'查看',
+    customerManagementEdit:'客户管理编辑',
+    customerManagementAdd:'客户管理添加',
+    settlement:'结算',
+    inspectInfo:'质检信息'
   }
 
 }

src/views/houseSelfCollect/component/routers/route.js

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

src/views/houseSelfCollect/customerManagement.vue

@@ -1,8 +1,53 @@
 <!--客户管理-->
 <template>
-  <div class="content">
+  <div>
+    <BaseHeaderLayout :leftSpan="12">
+      <template slot="left">
+        <ws-button type="primary" @click="getCustomer()">获取客户</ws-button>
+        <ws-button type="primary" @click="createCustomer()"
+          >创建新客户</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>
     <div class="seach">
-      <div class="search-left">
+      <!-- <div class="search-left">
         <ws-input v-model="searchKeyWord" placeholder="可按姓名、手机号查找" clearable maxlength="500" type="input"
           class="findValue"></ws-input>
         <ws-button class="find" type="primary" @click="find()">
@@ -13,19 +58,34 @@
               left: -8px;
             " src="../../../public/img/sousuo.png" alt />
         </ws-button>
-      </div>
+      </div> -->
       <div class="search-right">
-        <ws-button @click="getCustomer()">获取客户</ws-button>
-        <el-dialog title="客户扫码" :visible.sync="customerDialogVisible" width="30%">
+        <!-- <ws-button @click="getCustomer()">获取客户</ws-button> -->
+        <el-dialog
+          title="客户扫码"
+          :visible.sync="customerDialogVisible"
+          width="30%"
+        >
           <div id="qrcode"></div>
         </el-dialog>
-        <ws-button @click="createCustomer()">创建新客户</ws-button>
-        <el-dialog title="创建新客户" :visible.sync="creatNewCustomerDialogVisible" width="50%">
-         <customerManagementAdd></customerManagementAdd>
+        <!-- <ws-button @click="createCustomer()">创建新客户</ws-button> -->
+        <el-dialog
+          title="创建新客户"
+          :visible.sync="creatNewCustomerDialogVisible"
+          width="50%"
+        >
+          <customerManagementAdd></customerManagementAdd>
         </el-dialog>
       </div>
     </div>
-    <el-table class="wenzi" :data="customertList.records" style="width: 100%; margin-top: 10px" height="780">
+
+    <el-table
+      :data="customertList.records"
+      style="width: 100%; margin-top: 20px"
+      ref="warehouseList"
+      border
+      height="780"
+    >
       <el-table-column type="index" label="序号">
         <template scope="scope">
           <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
@@ -35,168 +95,209 @@
       <el-table-column prop="contractNo" label="客户"></el-table-column>
       <el-table-column prop="goodsName" label="手机号"></el-table-column>
       <el-table-column prop="weight" label="银行卡号"></el-table-column>
-      <el-table-column prop="unitContractPrice" label="开户行"></el-table-column>
+      <el-table-column
+        prop="unitContractPrice"
+        label="开户行"
+      ></el-table-column>
       <el-table-column prop="packingMethod" label="收款人"></el-table-column>
       <el-table-column prop="status" label="状态"></el-table-column>
       <el-table-column prop="address" label="操作">
         <template slot-scope="scope">
-          <img width="16" height="16" style="vertical-align: text-top; margin: 0 6px"
-            src="../../../public/img/chakan.png" @click="handleExamine(scope.row)" v-hasPermission="
+          <img
+            width="16"
+            height="16"
+            style="vertical-align: text-top; margin: 0 6px"
+            src="../../../public/img/chakan.png"
+            @click="handleExamine(scope.row)"
+            v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.view`
-            " alt />
-          <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px"
-            src="../../../public/img/bianji.png" @click="handleEdit(scope.row)" v-hasPermission="
+            "
+            alt
+          />
+          <img
+            width="17"
+            height="16"
+            style="vertical-align: text-top; margin: 0 6px"
+            src="../../../public/img/bianji.png"
+            @click="handleEdit(scope.row)"
+            v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.edit`
-            " alt />
-          <img width="16" height="17" style="
+            "
+            alt
+          />
+          <img
+            width="16"
+            height="17"
+            style="
               vertical-align: text-top;
               position: relative;
               top: -1px;
               margin: 0 6px;
-            " src="../../../public/img/shanchu.png" v-hasPermission="
+            "
+            src="../../../public/img/shanchu.png"
+            v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.delete`
-            " @click="handleDelete(scope.row)" alt />
+            "
+            @click="handleDelete(scope.row)"
+            alt
+          />
         </template>
       </el-table-column>
     </el-table>
-    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-      :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
-    </el-pagination>
+    <div style="text-align: center">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-size="deptCircularPage.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal"
+      >
+      </el-pagination>
+    </div>
   </div>
 </template>
 <script>
-  // import xx
-  // '@/model/houseSelfCollect/index'
-  import QRCode from 'qrcodejs2'
-  import customerManagementAdd from './customerManagementAdd.vue'
-  export default {
-    components: {
-      customerManagementAdd
-    },
-    watch: {},
-    data() {
-      return {
-        searchKeyWord: '',
-        customerDialogVisible: false,
-        creatNewCustomerDialogVisible:false,
-        customertList: {
-          records: [{
+// import xx
+// '@/model/houseSelfCollect/index'
+import QRCode from 'qrcodejs2'
+import customerManagementAdd from './customerManagementAdd.vue'
+export default {
+  components: {
+    customerManagementAdd,
+  },
+  watch: {},
+  data() {
+    return {
+      searchKeyWord: '',
+      customerDialogVisible: false,
+      creatNewCustomerDialogVisible: false,
+      customertList: {
+        records: [
+          {
             contractNo: '小王',
             goodsName: '17127741111',
             weight: '111111111',
             unitContractPrice: '312321312132321',
             packingMethod: '12213321231fsfssfd',
-            status: 'fsdfsdfsd'
-          }]
-        },
-        currentPage: 1,
-        pageSize: 10,
-        deptBudgetTotal: 0,
-        deptCircularPage: {}
-      }
-    },
-    methods: {
-      find() {
-        console.log('搜索')
-      },
-      //获取客户
-      getCustomer() {
-        this.customerDialogVisible = true
-        this.$nextTick(function() {
-          document.getElementById('qrcode').innerHTML = ''
-          let qrcode = new QRCode('qrcode', {
-            width: 150,
-            height: 150,
-            text: 'https：//www.baidu.com',
-            colorDark: '#109dff',
-            colorLight: '#d9d9d9'
-          })
-        })
+            status: 'fsdfsdfsd',
+          },
+        ],
       },
-      //创建客户
-      createCustomer() {
-        // this.creatNewCustomerDialogVisible = true
-        this.$router.push({
-          name: 'customerManagementAdd'
-          // query: { id: row.id },
+      currentPage: 1,
+      pageSize: 10,
+      deptBudgetTotal: 0,
+      deptCircularPage: {},
+      taskTypeList: [], //选择仓库数组
+      searchTypeText: '', //仓库
+      searchType: '',
+    }
+  },
+  methods: {
+    find() {
+      console.log('搜索')
+    },
+    //获取客户
+    getCustomer() {
+      this.customerDialogVisible = true
+      this.$nextTick(function () {
+        document.getElementById('qrcode').innerHTML = ''
+        let qrcode = new QRCode('qrcode', {
+          width: 150,
+          height: 150,
+          text: 'https://www.baidu.com',
+          colorDark: '#109dff',
+          colorLight: '#d9d9d9',
+          
         })
-      },
-      handleSizeChange(val) {
-        console.log(`每页 ${val} 条`)
-        this.pageSize = val
-        this.getList()
-      },
-      handleCurrentChange(val) {
-        this.currentPage = val
-        console.log(`当前页: ${val}`)
-        this.getList()
-      },
-      handleExamine(row) {
-        console.log(row)
-        // this.$router.push({
-        //   name: 'purchaseContractExamine',
-        //   query: { id: row.id, status: row.status },
-        // })
-      },
-      handleEdit(row) {
-        console.log(row)
-        this.$router.push({
-          name: 'customerManagementEdit',
-          query: {
-            id: row.id
-          }
+      })
+    },
+    //选择仓库改变事件
+    selecttaskType() {},
+    //创建客户
+    createCustomer() {
+      // this.creatNewCustomerDialogVisible = true
+      this.$router.push({
+        name: 'customerManagementAdd',
+        // query: { id: row.id },
+      })
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+    handleExamine(row) {
+      console.log(row)
+      // this.$router.push({
+      //   name: 'purchaseContractExamine',
+      //   query: { id: row.id, status: row.status },
+      // })
+    },
+    handleEdit(row) {
+      console.log(row)
+      this.$router.push({
+        name: 'customerManagementEdit',
+        query: {
+          id: row.id,
+        },
+      })
+    },
+    handleDelete(row) {
+      this.$confirm('确定删除该客户？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {})
+        .catch(() => {
+          return false
         })
-      },
-      handleDelete(row) {
-        console.log(row)
-        // var text = ''
-        // if (row.deliverType == 1) {
-        //   text =
-        //     '删除该合同将同时永久删除合同对应的临时仓库相关数据，是否确定删除？'
-        // } else {
-        //   text = '合同删除后不可恢复，是否继续删除？'
-        // }
-        // this.$confirm(text, '提示', {
-        //   confirmButtonText: '确定',
-        //   cancelButtonText: '取消',
-        //   type: 'warning',
-        // })
-        //   .then(() => {
-        //     deletecontract({ id: row.id })
-        //       .toPromise()
-        //       .then((response) => {
-        //         this.$notify.success({
-        //           title: '成功',
-        //           message: '删除成功',
-        //         })
-        //         this.getList()
-        //       })
-        //       .catch((response) => {})
-        //   })
-        //   .catch(() => {
-        //     return false
-        //   })
-      },
-      getList() {}
-    }
-  }
+    },
+    getList() {},
+  },
+}
 </script>
 <style lang="scss" scoped>
-  .content {
-    padding: 20px;
+.seach {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+  .find {
+    width: 32px;
   }
 
-  .seach {
+  .search-left {
     display: flex;
-    justify-content: space-between;
-    align-items: center;
-
-    .find {
-      width: 32px;
-    }
-
-    .search-left {
-      display: flex;
-    }
   }
+}
+.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>

src/views/houseSelfCollect/customerManagementAdd.vue

@@ -1,15 +1,28 @@
 <!--客户管理-->
 <template>
   <div class="content">
+     <!-- <el-row>
+      <el-col :span="12">
+        <h2 class="bg-left titleup">{{ information }}质检信息</h2>
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button class="bg-bottom" type="primary" size="small" @click="cancel"
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
+        >
+      </el-col>
+    </el-row> -->
     <div class="title">新增粮商</div>
     <div class="unload">
       <el-upload action="https://jsonplaceholder.typicode.com/posts/" :limit="2" list-type="picture-card"
         :on-preview="handlePictureCardPreview" :on-remove="handleRemove">
         <i class="el-icon-plus"></i>
       </el-upload>
-<!--      <el-dialog :visible.sync="dialogVisible">
-        <img width="100%" :src="dialogImageUrl" alt="">
-      </el-dialog> -->
       <el-form ref="form" :model="form" label-width="120px">
         <el-form-item label="姓名">
           <el-input v-model="form.name"></el-input>
@@ -77,7 +90,7 @@
         dialogImageUrl: '',
         dialogVisible: false,
         form:{
-          name:"姓名"
+          name:'姓名'
         },
         disabledFlag: true,
 
@@ -152,4 +165,7 @@
       display: flex;
     }
   }
+  .titleup {
+  position: relative;
+}
 </style>

src/views/houseSelfCollect/inspectInfo.vue

@@ -0,0 +1,318 @@
+<!--质检信息-->
+<template>
+  <div class="center">
+    <el-row>
+      <el-col :span="12">
+        <h2 class="bg-left titleup">{{ information }}质检信息</h2>
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button class="bg-bottom" type="primary" size="small" @click="cancel"
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
+        >
+      </el-col>
+    </el-row>
+    <div class="substance">
+      <ws-form>
+        <div style="width: 50%; margin: 0 auto">
+          <div class="title">基本信息</div>
+          <ws-info-table>
+            <ws-form-item label="编号" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入编号"
+                maxlength="100"
+                disabled
+                size="small"
+              />
+            </ws-form-item>
+            <ws-form-item label="仓位号" span="1" 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="客户" span="1" 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="囤位号" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入客户"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+            <ws-form-item label="车牌号" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入客户"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+            <ws-form-item label="货名" span="1" 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="扣重比" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入扣重比"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </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"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+            <ws-form-item label="杂质（%）" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入杂质占比"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+            <ws-form-item label="水分（%）" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入水分占比"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+            <ws-form-item label="霉变粒（%）" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入霉变粒占比"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+            <ws-form-item label="容重（克/升）" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入容重"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+            <ws-form-item label="热损伤（%）" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入热损伤占比"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+            <ws-form-item label="不完整粒（%）" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入不完整粒占比"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+            
+          </ws-info-table>
+          <div style="text-align:right;color:#323233;">潮粮单价（元/公斤）：000000000</div>
+          <div class="but">
+            <el-button @click="cancel" v-if="this.types != 2" type="primary"
+              >取消</el-button
+            >
+            <el-button @click="print" v-if="this.types != 2" type="primary"
+              >保存并打印</el-button
+            >
+            <el-button @click="cancel" v-if="this.types == 2" type="primary"
+              >关闭</el-button
+            >
+          </div>
+        </div>
+      </ws-form>
+    </div>
+    <houseSelfCollectPrint v-show="false"></houseSelfCollectPrint>
+  </div>
+</template>
+<script>
+import {} from '@/model/houseSelfCollect/index'
+import houseSelfCollectPrint from './houseSelfCollectPrint.vue'
+export default {
+  components: {
+    houseSelfCollectPrint,
+  },
+  watch: {},
+  data() {
+    return {
+      warehouseList: {},
+      disabled: false,
+      types: '',
+      information: '添加',
+    }
+  },
+  activated() {
+    this.types = this.$route.query.type
+    if (this.types == 2) {
+      this.disabled = true
+      this.information = '查看'
+    } else if (this.types == 3) {
+      this.disabled = false
+      this.information = '编辑'
+    }
+    console.log(this.information)
+  },
+  methods: {
+    print() {
+      this.$confirm('确定保存质检信息？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          // 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' })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    cancel() {
+      this.$router.push({ path: 'inspectionManagement' })
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.center {
+  background: #f6f7fc;
+}
+
+.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;
+  font-size: 14px;
+  color: #8890b1;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  border: none;
+}
+.title {
+  font-size: 16px;
+  font-weight: 600;
+  margin: 10px;
+}
+.titleup {
+  position: relative;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 15px;
+  background: #8890b1;
+  margin-right: 5px;
+}
+
+.substance {
+  background: #ffffff;
+  width: 100%;
+  border-radius: 4px;
+  margin: 0 auto;
+  padding-top: 20px;
+}
+/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;
+}
+.bg-left {
+  padding-left: 30px;
+}
+.bg-right {
+  padding-right: 10px;
+  text-align: right;
+}
+.bg-bottom {
+  margin: 15px 0px;
+}
+.titleup {
+  position: relative;
+}
+.titleup::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.but {
+  text-align: center;
+  margin: 20px auto;
+}
+</style>

src/views/houseSelfCollect/inspectionManagement.vue

@@ -1,9 +1,9 @@
 <!--质检管理-->
 <template>
   <div>
-     <BaseHeaderLayout :leftSpan="12">
-      <template slot="left"> 
-         <ws-button type="primary" @click="add">添加</ws-button>
+    <BaseHeaderLayout :leftSpan="12">
+      <template slot="left">
+        <ws-button type="primary" @click="inspectInfo(1)">添加</ws-button>
       </template>
       <template slot="right">
         <ws-select
@@ -48,8 +48,14 @@
       style="width: 100%; margin-top: 20px"
       ref="warehouseList"
       border
+      height="780"
     >
-      <el-table-column type="index" label="序号" width="50"></el-table-column>
+      <el-table-column type="index" label="序号" width="50">
+        <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"
         width="120"
@@ -58,174 +64,72 @@
       <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 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="inspectInfo(2)">查看</el-button>
+        <el-button @click="inspectInfo(3)">编辑</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 style="text-align:center">
+    <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="currentPage"
+      :page-size="deptCircularPage.pageSize"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="deptBudgetTotal"
+    >
+    </el-pagination>
+    </div>
   </div>
 </template>
 <script>
-import {
-  // getList,
+import{
+
 } from '@/model/houseSelfCollect/index'
 
 export default {
-
-  components: {
-
-  },
-  watch: {
-
-  },
+  components: {},
+  watch: {},
   data() {
     return {
-      searchKeyWord:"",
-      taskTypeList:[],
-      searchType:"", 
-      searchTypeText:"",
-      warehouseList:[{
-        contractNo:"快付款",
-      }],
-      paymentForm:false,
-      switchchange:"",
-      disabled:false,
-    }
-  },
-  activated() {
+       //分页
+      currentPage: 1,
+      pageSize: 10,
+      deptCircularPage:{},
+      deptBudgetTotal: 0,
 
+      searchKeyWord: '',
+      taskTypeList: [],
+      searchType: '',
+      searchTypeText: '',
+      warehouseList: [
+        {
+          contractNo: '快付款',
+        },
+      ],
+    }
   },
+  activated() {},
   methods: {
-    add(){//添加
-    this.switchchange = "添加"
-    this.paymentForm = true
-      this.disabled = false
-
+    inspectInfo(index) {
+      //添加,编辑，查看
+      this.$router.push({ path: 'inspectInfo', query: { type: index } })
     },
-    selecttaskType(){
-
-    },
-    del(){//删除
-     this.$confirm('确定删除质检信息？', '提示', {
+    selecttaskType() {},
+    del() {
+      //删除
+      this.$confirm('确定删除质检信息？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
@@ -234,32 +138,29 @@ export default {
         .catch(() => {
           return false
         })
-
     },
-    edit(){ //编辑
-     this.switchchange = "编辑"
-    this.paymentForm = true
-    this.disabled = false
+    // commit() {
+    //   //保存
+    //   this.$confirm('确定保存质检信息？', '提示', {
+    //     confirmButtonText: '确定',
+    //     cancelButtonText: '取消',
+    //     type: 'warning',
+    //   })
+    //     .then(() => {})
+    //     .catch(() => {
+    //       return false
+    //     })
+    // },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
     },
-    look(){//查看
-     this.switchchange = "查看"
-    this.paymentForm = true
-    this.disabled = true
-
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
     },
-    commit(){//保存
-     this.$confirm('确定保存质检信息？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {})
-        .catch(() => {
-          return false
-        })
-
-    }
-
   },
 }
 </script>
@@ -269,7 +170,7 @@ export default {
   font-weight: 600;
   margin: 20px 0 0 20px;
 }
-.tit{
+.tit {
   font-size: 16px;
   font-weight: 600;
   margin: 20px;

src/views/houseSelfCollect/paymentManagement.vue

@@ -1,4 +1,4 @@
-<!--客户管理-->
+<!--付款管理-->
 <template>
   <div>
     <BaseHeaderLayout :leftSpan="12">
@@ -31,7 +31,7 @@
           v-model="searchKeyWord"
           placeholder="可按编号、客户名、车牌号查找"
           clearable
-          maxlength="500" 
+          maxlength="500"
           type="input"
         ></ws-input>
         <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
@@ -51,11 +51,11 @@
       </template>
     </BaseHeaderLayout>
     <el-table
-      class="wenzi"
       :data="warehouseList"
       style="width: 100%; margin-top: 20px"
       ref="warehouseList"
       border
+      height="780"
       @selection-change="handleSelectionChange"
     >
       <el-table-column
@@ -63,7 +63,12 @@
         type="selection"
         width="55"
       ></el-table-column>
-      <el-table-column type="index" label="序号" width="50"></el-table-column>
+      <el-table-column type="index" label="序号" width="50">
+        <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
         class="table_td"
         prop="contractNo"
@@ -167,6 +172,17 @@
       </ws-form>
     </el-dialog>
     <!-- <houseSelfCollectPrint v-show="false"></houseSelfCollectPrint> -->
+    <div style="text-align:center">
+    <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="currentPage"
+      :page-size="deptCircularPage.pageSize"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="deptBudgetTotal"
+    >
+    </el-pagination>
+    </div>
   </div>
 </template>
 <script>
@@ -175,11 +191,16 @@ import houseSelfCollectPrint from './houseSelfCollectPrint.vue'
 
 export default {
   components: {
-    houseSelfCollectPrint
+    houseSelfCollectPrint,
   },
   watch: {},
   data() {
     return {
+      //分页
+      currentPage: 1,
+      pageSize: 10,
+      deptCircularPage:{},
+      deptBudgetTotal: 0,
       warehouseList: [
         {
           collectionEdPayable: '快付款',
@@ -191,7 +212,7 @@ export default {
       searchTypeText: '',
       searchKeyWord: '',
       value1: '', //付款日期
-      modification:[],
+      modification: [],
     }
   },
   activated() {},
@@ -212,83 +233,73 @@ export default {
         })
     },
     settlement(index) {
-         this.$router.push({ path: 'settlement',
-         query: { type: index }
-         })
+      this.$router.push({ path: 'settlement', query: { type: index } })
     },
     payment() {
-      if(this.modification.length == 0){
-         this.$message.warning('请选择要付款的条目')
-      }else{
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择要付款的条目')
+      } else {
         this.paymentForm = true
       }
     },
-    paymentSubmit(){
-      this.$confirm(
-        '确定提交付款信息？',
-        '提示',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        })
+    paymentSubmit() {
+      this.$confirm('确定提交付款信息？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
         .then(() => {})
         .catch(() => {
           return false
         })
     },
-    reject(){
-        if(this.modification.length == 0){
-         this.$message.warning('请选择要驳回的条目')
-      }else{
-        this.$confirm(
-        '驳回后任务将退回到统计，是否确定驳回？',
-        '提示',
-        {
+    reject() {
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择要驳回的条目')
+      } else {
+        this.$confirm('驳回后任务将退回到统计，是否确定驳回？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning',
         })
-        .then(() => {})
-        .catch(() => {
-          return false
-        })
+          .then(() => {})
+          .catch(() => {
+            return false
+          })
       }
     },
-     adopt(){
-        if(this.modification.length == 0){
-         this.$message.warning('请选择要通过的条目')
-        }else{
+    adopt() {
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择要通过的条目')
+      } else {
         this.$confirm(
-        '审核通过后，任务将发送给决策人，是否确定通过？',
-        '提示',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        })
-        .then(() => {})
-        .catch(() => {
-          return false
-        })
+          '审核通过后，任务将发送给决策人，是否确定通过？',
+          '提示',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          }
+        )
+          .then(() => {})
+          .catch(() => {
+            return false
+          })
       }
     },
-    examine(){
-       if(this.modification.length == 0){
-         this.$message.warning('请选择要审核的条目')
-      }else{
-        this.$confirm(
-        '审核通过后，任务将发送给财务，是否确定通过？',
-        '提示',
-        {
+    examine() {
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择要审核的条目')
+      } else {
+        this.$confirm('审核通过后，任务将发送给财务，是否确定通过？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning',
         })
-        .then(() => {})
-        .catch(() => {
-          return false
-        })
+          .then(() => {})
+          .catch(() => {
+            return false
+          })
       }
     },
     // print(){
@@ -313,7 +324,7 @@ export default {
         }
       }
     },
-     handleSelectionChange(val) {
+    handleSelectionChange(val) {
       this.modification = val
     },
     // handleRowClick(row) {
@@ -329,8 +340,18 @@ export default {
     //     }
     //   }
     // },
-    selecttaskType() {}
-  } 
+    selecttaskType() {},
+     handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+  },
 }
 </script>
 <style lang="scss" scoped>

src/views/houseSelfCollect/settlement.vue

@@ -3,14 +3,14 @@
   <div class="center">
     <el-row>
       <el-col :span="12">
-        <h2 class="bg-left titleup">查看信息</h2>
+        <h2 class="bg-left titleup">{{information}}信息</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
         <el-button
           class="bg-bottom"
           type="primary"
           size="small"
-          @click="returnsales()"
+          @click="cancel"
           ><img
             width="6"
             height="10"
@@ -213,6 +213,14 @@
                 :disabled="disabled"
               />
             </ws-form-item>
+            <ws-form-item label="称重扣款" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入称重扣款"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
             <ws-form-item label="运费补助" span="1" prop="waterContent">
               <ws-input
                 placeholder="请输入运费补助"
@@ -290,7 +298,7 @@
                 size="small"
               />
             </ws-form-item>
-            <ws-form-item
+            <!-- <ws-form-item
               label="纯重单价（元/公斤）"
               span="1"
               prop="waterContent"
@@ -301,7 +309,7 @@
                 :disabled="disabled"
                 size="small"
               />
-            </ws-form-item>
+            </ws-form-item> -->
             <ws-form-item label="记事（选填）" span="1" prop="waterContent">
               <ws-input
                 placeholder="备注信息，不超过20个字"
@@ -312,8 +320,9 @@
             </ws-form-item>
           </ws-info-table>
           <div class="but">
-            <el-button @click="cancel">取消</el-button>
-            <el-button @click="print">保存并打印</el-button>
+            <el-button @click="cancel" v-if="this.types == 2" type="primary">取消</el-button>
+            <el-button @click="print" v-if="this.types == 2" type="primary">保存并打印</el-button>
+            <el-button @click="cancel" v-if="this.types == 1" type="primary">关闭</el-button>
           </div>
         </div>
       </ws-form>
@@ -332,14 +341,19 @@ export default {
   data() {
     return {
       warehouseList: {},
-      disabled:true
+      disabled:false,
+      types:'',
+      information:'结算',
     }
   },
   activated() {
     this.types = this.$route.query.type
-    if( this.types == 1){
+    if( this.types == 2){
          this.disabled=true
+         this.information = '查看'
+         
     }
+    console.log( this.information)
   },
   methods: {
     print() {
@@ -383,6 +397,7 @@ export default {
 .title {
   font-size: 16px;
   font-weight: 600;
+  margin: 10px;
 }
 .title::before {
   content: '';

src/views/houseSelfCollect/weighingManagement.vue

@@ -46,8 +46,14 @@
       style="width: 100%; margin-top: 20px"
       ref="warehouseList"
       border
+      height="780"
     >
-      <el-table-column type="index" label="序号" width="50"></el-table-column>
+      <el-table-column type="index" label="序号" width="50">
+        <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"
         width="120"
@@ -165,6 +171,17 @@
       </ws-form>
     </el-dialog>
     <houseSelfCollectPrint v-show="false"></houseSelfCollectPrint>
+     <div style="text-align:center">
+    <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="currentPage"
+      :page-size="deptCircularPage.pageSize"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="deptBudgetTotal"
+    >
+    </el-pagination>
+    </div>
   </div>
 </template>
 <script>
@@ -177,6 +194,11 @@ export default {
   watch: {},
   data() {
     return {
+       //分页
+      currentPage: 1,
+      pageSize: 10,
+      deptCircularPage:{},
+      deptBudgetTotal: 0,
       paymentForm: false,
       paymentForm1: false,
       warehouseList: [
@@ -239,6 +261,16 @@ export default {
       // window.location.reload()
       this.$router.push({ path: 'paymentManagement' })
     },
+     handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
   },
 }
 </script>