Merge branch 'master' of http://git.echepei.com/zhujiawei/Warehouse_management_ui

src/views/basicdata/corps/index.vue

@@ -31,26 +31,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="简称" prop="fCname">
-        <el-input
-          v-model="queryParams.fCname"
-          style="width: 250px"
-          placeholder="请输入简称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="英文名称" prop="fEname">
-        <el-input
-          v-model="queryParams.fEname"
-          style="width: 250px"
-          placeholder="请输入英文名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="电话" prop="fTel">
         <el-input
           v-model="queryParams.fTel"
@@ -61,45 +41,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
-      <el-form-item label="录入人" prop="fTel">
-        <el-input
-          v-model="queryParams.fTel"
-          style="width: 250px"
-          placeholder="请输入录入人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-
-      <el-form-item label="录入时间" prop="fContractb">
-        <el-date-picker clearable size="small" style="width: 250px"
-                        v-model="queryParams.fContractb"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="选择合同起">
-        </el-date-picker>
-      </el-form-item>
-
-      <el-form-item label="修改人" prop="fTel">
-        <el-input
-          v-model="queryParams.fTel"
-          placeholder="请输入修改人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-
-      <el-form-item label="修改时间" prop="fContracte">
-        <el-date-picker clearable size="small" style="width: 250px"
-                        v-model="queryParams.fContracte"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="选择合同至">
-        </el-date-picker>
-      </el-form-item>
       <el-form-item label="状态" prop="fStatus">
         <el-select
           v-model="queryParams.fStatus"
@@ -115,7 +56,6 @@
             :value="dict.dictValue"
           />
         </el-select>
-
       </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -309,7 +249,7 @@
         </el-row>
 
         <el-row>
-          
+
           <el-col :span="8">
             <el-form-item label="规模" prop="fScale">
               <el-input v-model="form.fScale" style="width: 250px" placeholder="请输入规模" />
@@ -328,7 +268,7 @@
         </el-row>
 
         <el-row>
-          
+
         </el-row>
 
         <el-row>
@@ -357,7 +297,7 @@
         </el-row>
 
         <el-row>
-          
+
           <el-col :span="8">
             <el-form-item label="税号" prop="fTax">
               <el-input v-model="form.fTax" style="width: 250px" placeholder="请输入税号" />
@@ -404,7 +344,7 @@
         </el-row>
 
         <el-row>
-          
+
           <el-col :span="8">
             <el-form-item label="本位币银行" prop="fBankname">
               <el-input v-model="form.fBankname" style="width: 250px" placeholder="请输入本位币银行" />
@@ -641,7 +581,6 @@
       getList() {
         this.loading = true;
         listCorps(this.queryParams).then(response => {
-          console.log(response)
           this.corpsList = response.rows;
           this.total = response.total;
           this.loading = false;

src/views/index.vue

@@ -3,61 +3,61 @@
     <ul class="block">
       <li>
         <div>
-          <i class="el-icon-success" style="font-size: 50px;text-align: center"></i>
+          <i class="el-icon-download" style="font-size: 50px;text-align: center"></i>
           <p>入库</p>
         </div>
       </li>
       <li>
         <div>
-          <i class="el-icon-success" style="font-size: 50px;text-align: center"></i>
+          <i class="el-icon-upload2" style="font-size: 50px;text-align: center"></i>
           <p>出库</p>
         </div>
       </li>
       <li>
         <div>
-          <i class="el-icon-success" style="font-size: 50px;text-align: center"></i>
+          <i class="el-icon-s-custom" style="font-size: 50px;text-align: center"></i>
           <p>新增用户</p>
         </div>
       </li>
       <li>
         <div>
-          <i class="el-icon-success" style="font-size: 50px;text-align: center"></i>
+          <i class="el-icon-s-cooperation" style="font-size: 50px;text-align: center"></i>
           <p>新增商品</p>
         </div>
       </li>
       <li>
         <div>
-          <i class="el-icon-success" style="font-size: 50px;text-align: center"></i>
+          <i class="el-icon-connection" style="font-size: 50px;text-align: center"></i>
           <p>调拨</p>
         </div>
       </li>
       <li>
         <div>
-          <i class="el-icon-success" style="font-size: 50px;text-align: center"></i>
+          <i class="el-icon-wallet" style="font-size: 50px;text-align: center"></i>
           <p>收款</p>
         </div>
       </li>
       <li>
         <div>
-          <i class="el-icon-success" style="font-size: 50px;text-align: center"></i>
+          <i class="el-icon-money" style="font-size: 50px;text-align: center"></i>
           <p>付款</p>
         </div>
       </li>
       <li>
         <div>
-          <i class="el-icon-success" style="font-size: 50px;text-align: center"></i>
+          <i class="el-icon-s-management" style="font-size: 50px;text-align: center"></i>
           <p>对账</p>
         </div>
       </li>
       <li>
         <div>
-          <i class="el-icon-success" style="font-size: 50px;text-align: center"></i>
+          <i class="el-icon-takeaway-box" style="font-size: 50px;text-align: center"></i>
           <p>货转</p>
         </div>
       </li>
       <li>
         <div>
-          <i class="el-icon-success" style="font-size: 50px;text-align: center"></i>
+          <i class="el-icon-s-order" style="font-size: 50px;text-align: center"></i>
           <p>协议</p>
         </div>
       </li>
@@ -101,18 +101,6 @@ export default {
         date: '2020-11-20 12:00',
         name: '仓储费审核结算审核',
         address: '查看详情'
-      }, {
-        date: '2020-11-20 12:00',
-        name: '某客户出库单审核',
-        address: '查看详情'
-      }, {
-        date: '2020-11-20 12:00',
-        name: '仓储费审核结算审核',
-        address: '查看详情'
-      }, {
-        date: '2020-11-20 12:00',
-        name: '仓储费审核结算审核',
-        address: '查看详情'
       }]
     };
   },
@@ -123,10 +111,11 @@ export default {
     this.getList();
   },
   methods: {
+    //查询消息中心
     getList() {
       this.loading = true;
       listCorps(this.queryParams).then(response => {
-        console.log(response);
+        console.log(response.rows);
       });
     },
     goTarget(href) {
@@ -260,6 +249,7 @@ export default {
     margin-left: 10px;
     text-align: center;
     color: #FFFFFF;
+    border-radius: 10px;
     div{
       margin-top: 40px;
       p{

src/views/warehouseBusiness/agreement/index.vue

@@ -174,7 +174,7 @@
     <!-- 添加或修改仓储费对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px"
-               style="display: flex;flex-wrap: wrap;justify-content:space-between"
+               style="display: flex;flex-wrap: wrap;justify-content:space-around"
       >
         <el-form-item label="客户名称" prop="fCorpid">
           <el-input v-model="form.fCorpid" placeholder="请输入客户名称" style="width: 200px"/>
@@ -267,7 +267,6 @@
         <!--        <el-button :disabled="dataListSelection.length <= 0" @click.prevent="creditClick()">入库确认</el-button>-->
         <!--        <el-button :disabled="browseStatus" @click.prevent="deleteRoww(warehouseDrList)">删除</el-button>-->
         <el-button @click="getList_s()">新增</el-button>
-        <el-button @click="test_s">删除</el-button>
       </div>
       <el-table v-loading="loading_s" :data="agreementitemsList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center"/>
@@ -344,8 +343,7 @@
               size="mini"
               type="text"
               icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['warehouseBusiness:agreementitems:remove']"
+              @click.native.prevent="deleteRow(scope.$index, agreementitemsList)"
             >删除
             </el-button>
           </template>
@@ -595,17 +593,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const fIds = row.fId || this.ids
-      this.$confirm('是否确认删除仓储费编号为"' + fIds + '"的数据项?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        return delAgreement(fIds)
-      }).then(() => {
-        this.getList()
-        this.msgSuccess('删除成功')
-      })
+      console.log(row)
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -619,7 +607,11 @@ export default {
       }).then(response => {
         this.download(response.msg)
       })
-    }
+    },
+    deleteRow(index, rows) {
+
+      rows.splice(index, 1);
+    },
   }
 }
 </script>

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -536,7 +536,7 @@
         <h3>库存明细</h3>
         <el-button :disabled="browseStatus" @click.prevent="addRelevant()">新增</el-button>
         <el-button :disabled="dataListSelection.length <= 0" @click.prevent="creditClick()"
-          >入库确认
+          >货转确认
         </el-button>
         <el-button type="primary" @click="submitForm(2)">保 存</el-button>
       </div>
@@ -610,6 +610,14 @@
         >
         </el-table-column>
         <el-table-column
+          prop="fPlannetweight"
+          header-align="center"
+          width="180px"
+          align="center"
+          label="库存净重"
+        >
+        </el-table-column>
+        <el-table-column
           prop="fQty"
           header-align="center"
           width="180px"
@@ -619,6 +627,7 @@
           <template slot-scope="scope">
             <el-input
               oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
+              @change="qtyChange(scope.row)"
               v-model="scope.row.fQty"
               placeholder="货转件数"
               :disabled="browseStatus"
@@ -644,7 +653,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="fPlannetweight"
+          prop="fNetweight"
           header-align="center"
           width="180px"
           align="center"
@@ -653,7 +662,7 @@
           <template slot-scope="scope">
             <el-input
               oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d).*$/, "$1$2.$3")'
-              v-model="scope.row.fPlannetweight"
+              v-model="scope.row.fNetweight"
               placeholder="货转净重"
               :disabled="browseStatus"
               show-word-limit
@@ -1675,8 +1684,12 @@ export default {
     },
     // 库存总账导出数据
     whgenlegData () {
+      if (this.dialogWhgenlegList.length === 0) {
+        this.$message({message: '未勾选信息', type: 'warning'})
+        return false
+      }
       for (let whgen in this.dialogWhgenlegList) {
-        if (!this.form.fMblno) {
+        if (!this.form.fMblno || this.form.fMblno === '') {
           this.$set(this.form, 'fMblno', this.dialogWhgenlegList[whgen].fMblno)
         }
         this.dataList.push({
@@ -1688,9 +1701,11 @@ export default {
           fWarehouselocid: this.dialogWhgenlegList[whgen].fWarehouseLocationid,
           fWarehouselocids: this.dialogWhgenlegList[whgen].fWarehouseLocationids,
           fPlanqty: this.dialogWhgenlegList[whgen].fQtyblc,
+          fPlannetweight: this.dialogWhgenlegList[whgen].fNetweightblc,
           fPlangrossweight: this.dialogWhgenlegList[whgen].fGrossweightblc,
           fQty: 0,
           fCntqty: 1,
+          fNetweight: 0,
           fGrossweight: 0,
           fPackagespecs: null,
           fGoodsval: null,
@@ -2063,11 +2078,11 @@ export default {
       this.dataListSelection = selection;
       if (this.Printinglist.length > 0) {
           this.fTruckno = selection[0].fTruckno;
-          this.fBsdate =  new Date(selection[0].fBsdate) 
+          this.fBsdate =  new Date(selection[0].fBsdate)
           this.fCntrtype = selection[0].fCntrtype;
           this.fGoodsids = selection[0].fGoodsids;
       }
-      
+
     },
      // 库存明细多选框结果
     dataListChange (row) {
@@ -2182,6 +2197,20 @@ export default {
           this.download(response.msg);
         });
     },
+    // 货转件数的计算
+    qtyChange(row) {
+      if (!row.fQty || row.fQty === '') {
+        this.$set(row, 'fNetweight', 0)
+        this.$set(row, 'fGrossweight', 0)
+        return false
+      }
+      // 净重 fPlannetweight
+      // 毛重 fPlangrossweight
+      let netweight = parseFloat(Number(row.fPlannetweight) / Number(row.fQtyblc)).toFixed(6)
+      let grossweigh = parseFloat(Number(row.fPlangrossweight) / Number(row.fQtyblc)).toFixed(6)
+      this.$set(row, 'fNetweight', parseFloat(Number(netweight) * Number(row.fQty)).toFixed(6))
+      this.$set(row, 'fGrossweight', parseFloat(Number(grossweigh) * Number(row.fQty)).toFixed(6))
+    },
     deleteRow(index, rows) {
       rows.splice(index, 1);
     },

src/views/warehouseBusiness/outStock/index.vue

@@ -878,7 +878,7 @@
         >
         </el-table-column>
         <el-table-column
-          prop="fgrossweight"
+          prop="fGrossweight"
           header-align="center"
           width="180px"
           align="center"
@@ -895,7 +895,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="fnetweight"
+          prop="fNetweight"
           header-align="center"
           width="180px"
           align="center"
@@ -912,7 +912,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="fqty"
+          prop="fQty"
           header-align="center"
           width="180px"
           align="center"
@@ -921,6 +921,7 @@
           <template slot-scope="scope">
             <el-input
               oninput='this.value=this.value.replace(/[^\-?\d]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "")'
+              @change="qtyChange(scope.row)"
               v-model="scope.row.fQty"
               :disabled="browseStatus"
               placeholder="出库件数"
@@ -962,7 +963,7 @@
             />
           </template>
         </el-table-column>
-        
+
         <el-table-column
           prop="fCntrno"
           header-align="center"
@@ -2365,7 +2366,6 @@ export default {
         });
         return false;
       }
-
       this.whgenlegList = [];
       this.dialogWhgenlegList = [];
       this.whgenlegTotal = 0;
@@ -2374,39 +2374,22 @@ export default {
     },
     // 库存总账导出数据
     whgenlegData() {
-      console.log(this.dialogWhgenlegList);
-      console.log(this.whgenlegList);
-      if (this.dialogWhgenlegList.length == 0) {
-        this.dataList.push({
-          fMblno: this.whgenlegList[0].fMblno,
-          fGoodsid: this.whgenlegList[0].fGoodsid,
-          fCntrtype: null,
-          fQtyblc: this.whgenlegList[0].fQtyblc,
-          fWarehouseLocationids: this.whgenlegList[0]
-            .fWarehouseLocationids,
-          fGoodsids: this.whgenlegList[0].fGoodsids,
-          fGrossweight: 0,
-          fNetweight: 0,
-          fQty: 0,
-          fCntqty: 1,
-          fPackagespecs: null,
-          fWarehouselocid: this.whgenlegList[0].fWarehouseLocationid,
-          fCntrno: this.whgenlegList[0].fCntrno,
-          fGoodsval: null,
-          fTruckno: null,
-          remark: null,
-        });
-        this.whgenlegVisible = false;
-        return 
+      if (this.dialogWhgenlegList.length === 0) {
+        this.$message({message: '未勾选信息', type: 'warning'})
+        return false
       }
       for (let whgen in this.dialogWhgenlegList) {
+        if (!this.form.fMblno || this.form.fMblno === '') {
+          this.$set(this.form, 'fMblno', this.dialogWhgenlegList[whgen].fMblno)
+        }
         this.dataList.push({
           fMblno: this.dialogWhgenlegList[whgen].fMblno,
           fGoodsid: this.dialogWhgenlegList[whgen].fGoodsid,
           fCntrtype: null,
           fQtyblc: this.dialogWhgenlegList[whgen].fQtyblc,
-          fWarehouseLocationids: this.dialogWhgenlegList[whgen]
-            .fWarehouseLocationids,
+          fNetweightblc: this.dialogWhgenlegList[whgen].fNetweightblc,
+          fGrossweightblc: this.dialogWhgenlegList[whgen].fGrossweightblc,
+          fWarehouseLocationids: this.dialogWhgenlegList[whgen].fWarehouseLocationids,
           fGoodsids: this.dialogWhgenlegList[whgen].fGoodsids,
           fGrossweight: 0,
           fNetweight: 0,
@@ -2506,7 +2489,6 @@ export default {
       this.whgenlegParams.fCorpid = this.form.fCorpid;
       this.whgenlegParams.fWarehouseid = this.form.fWarehouseid;
       this.whgenlegParams.fTrademodeid = this.form.fTrademodeid;
-
       listWhgenleg(this.whgenlegParams).then((response) => {
         this.whgenlegList = response.rows;
         console.log(this.whgenlegList);
@@ -3182,6 +3164,20 @@ export default {
           this.download(response.msg);
         });
     },
+    // 出库件数的计算
+    qtyChange(row) {
+      if (!row.fQty || row.fQty === '') {
+        this.$set(row, 'fNetweight', 0)
+        this.$set(row, 'fGrossweight', 0)
+        return false
+      }
+      // 净重 fNetweightblc
+      // 毛重 fGrossweightblc
+      let netweight = parseFloat(Number(row.fNetweightblc) / Number(row.fQtyblc)).toFixed(6)
+      let grossweigh = parseFloat(Number(row.fGrossweightblc) / Number(row.fQtyblc)).toFixed(6)
+      this.$set(row, 'fNetweight', parseFloat(Number(netweight) * Number(row.fQty)).toFixed(6))
+      this.$set(row, 'fGrossweight', parseFloat(Number(grossweigh) * Number(row.fQty)).toFixed(6))
+    },
     deleteRow(index, rows) {
       rows.splice(index, 1);
     },