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

src/api/basicdata/warehouse.js

@@ -64,3 +64,11 @@ export function exportWarehouse(query) {
     params: query
   })
 }
+
+// 删除仓库
+export function delCusCon(fId) {
+  return request({
+    url: '/basicdata/area/' + fId,
+    method: 'delete'
+  })
+}

src/components/Uploadfile/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="display: flex; justify-content:center;">
-    <button style="height: 20px"><a :href=File>查看</a></button>
+    <button style="height: 20px"><a target="_blank"  :href=File>查看</a></button>
     <el-upload
       class="upload-demo"
       :action="uploadImgUrl"

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>
@@ -256,11 +196,6 @@
 
         <el-row>
           <el-col :span="8">
-            <el-form-item label="名称" prop="fName">
-              <el-input v-model="form.fName" style="width: 250px" placeholder="请输入名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
             <el-form-item label="简称" prop="fCname">
               <el-input v-model="form.fCname" style="width: 250px" placeholder="请输入简称" />
             </el-form-item>
@@ -270,14 +205,14 @@
               <el-input v-model="form.fEname" style="width: 250px" placeholder="请输入英文名称" />
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
           <el-col :span="8">
             <el-form-item label="电话" prop="fTel">
               <el-input v-model="form.fTel" style="width: 250px" placeholder="请输入电话" />
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <el-row>
           <el-col :span="8">
             <el-form-item label="传真" prop="fFax">
               <el-input v-model="form.fFax" style="width: 250px" placeholder="请输入传真" />
@@ -288,14 +223,14 @@
               <el-input v-model="form.fEmail" style="width: 250px" placeholder="请输入邮箱" />
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
           <el-col :span="8">
             <el-form-item label="联系人" prop="fManage">
               <el-input v-model="form.fManage" style="width: 250px" placeholder="请输入联系人" />
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <el-row>
           <el-col :span="8">
             <el-form-item label="地址" prop="fAddr">
               <el-input v-model="form.fAddr" style="width: 250px" placeholder="请输入地址" />
@@ -306,15 +241,15 @@
               <el-input v-model="form.fEaddr" style="width: 250px" placeholder="请输入英文地址" />
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
-          
           <el-col :span="8">
             <el-form-item label="规模" prop="fScale">
               <el-input v-model="form.fScale" style="width: 250px" placeholder="请输入规模" />
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <el-row>
+
           <el-col :span="8">
             <el-form-item label="省" prop="fProvince">
               <el-input v-model="form.fProvince" style="width: 250px" placeholder="请输入省" />
@@ -325,15 +260,8 @@
               <el-input v-model="form.fCity" style="width: 250px" placeholder="请输入市" />
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
-          
-        </el-row>
-
-        <el-row>
           <el-col :span="8">
-            <el-form-item label="结算表票结、月结" prop="fStltypeid">
+            <el-form-item label="结算方式" prop="fStltypeid">
               <el-select v-model="form.fStltypeid" style="width: 250px" placeholder="请选择结算表票结、月结">
                 <el-option
                   v-for="dict in fStltypeidOptions"
@@ -344,6 +272,9 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <el-row>
           <el-col :span="8">
             <el-form-item label="结费天数" prop="fStldays">
               <el-input v-model="form.fStldays" style="width: 250px" placeholder="请输入结费天数" />
@@ -354,15 +285,15 @@
               <el-input v-model="form.fContractno" style="width: 250px" placeholder="请输入合同号" />
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
-          
           <el-col :span="8">
             <el-form-item label="税号" prop="fTax">
               <el-input v-model="form.fTax" style="width: 250px" placeholder="请输入税号" />
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <el-row>
+
           <el-col :span="8">
             <el-form-item label="合同起" prop="fContractb">
               <el-date-picker clearable size="small" style="width: 250px"
@@ -383,14 +314,14 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
           <el-col :span="8">
             <el-form-item label="开票电话" prop="fInvtel">
               <el-input v-model="form.fInvtel" style="width: 250px" placeholder="请输入开票电话" />
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <el-row>
           <el-col :span="8">
             <el-form-item label="开票地址" prop="fInvaddr">
               <el-input v-model="form.fInvaddr" style="width: 250px" placeholder="请输入开票地址" />
@@ -401,15 +332,14 @@
               <el-input v-model="form.fBankno" style="width: 250px" placeholder="请输入本位币账号" />
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
-          
           <el-col :span="8">
             <el-form-item label="本位币银行" prop="fBankname">
               <el-input v-model="form.fBankname" style="width: 250px" placeholder="请输入本位币银行" />
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <el-row>
            <el-col :span="8">
             <el-form-item label="外币账号" prop="fUbankno">
               <el-input v-model="form.fUbankno" style="width: 250px" placeholder="请输入外币账号" />
@@ -420,10 +350,7 @@
               <el-input v-model="form.fUbankname" style="width: 250px" placeholder="请输入外币银行" />
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="状态">
               <!--<el-radio-group v-model="form.fStatus">
                 <el-radio label="1">请选择字典生成</el-radio>
@@ -437,9 +364,8 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-          </el-col>
         </el-row>
+
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" style="width: 400px" placeholder="请输入备注" />
         </el-form-item>
@@ -641,7 +567,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/basicdata/warehouse/index.vue

@@ -238,7 +238,7 @@
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
-                @click.native.prevent="deleteRow(scope.$index,scope.row.tId, contactList)"
+                @click.native.prevent="deleteRow(scope.$index,scope.row.fId, contactList)"
                 v-hasPermi="['basicdata:contact:edit']"
               >删除</el-button>
             </template>
@@ -255,7 +255,7 @@
 </template>
 
 <script>
-import { listWarehouse, getWarehouse, delWarehouse, addWarehouse, updateWarehouse,changeWareStatus, exportWarehouse } from "../../../api/basicdata/warehouse";
+import { listWarehouse, getWarehouse, delWarehouse, addWarehouse, updateWarehouse,changeWareStatus, exportWarehouse,delCusCon } from "../../../api/basicdata/warehouse";
 
 export default {
   name: "Warehouse",
@@ -330,7 +330,6 @@ export default {
           cancelButtonText: "取消",
           type: "warning"
         }).then(function() {
-          alert(index);
           return delCusCon(index);
         }).then(() => {
           this.getList();

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,
@@ -1992,7 +2007,6 @@ export default {
           formData.append("warehousebillsitems", JSON.stringify(this.dataListSelection))
           formData.append("whgenleg", JSON.stringify(this.relevantAttachments))
           addWhgenleg(formData).then((response) => {
-            this.creditStatus = true
             this.msgSuccess("入账成功");
             for (let li in this.dataListSelection) {
               for (let i in this.dataList) {
@@ -2007,10 +2021,10 @@ export default {
                 }
               }
             }
+            this.$refs.table.clearSelection();
           })
         }
       })
-      console.log('有东西')
     },
     // 付款合计
     warehouseDrSummaries (param) {
@@ -2063,11 +2077,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 +2196,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.fPlanqty)).toFixed(6)
+      let grossweigh = parseFloat(Number(row.fPlangrossweight) / Number(row.fPlanqty)).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);
     },

vue.config.js

@@ -34,8 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.137.73:9010`,
-        // target: `http://engineering.echepei.com:9010/`,
+        // target: `http://192.168.137.73:9010`,
+        target: `http://engineering.echepei.com:9010/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''