修改

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -1274,6 +1274,7 @@
                 placeholder="请选择计价单位"
                 clearable
                 :disabled="browseStatus"
+                 @change="changeFeeUnit(scope.row)"
               >
                 <el-option
                   v-for="(item, index) in fFeetunitOptions"
@@ -1640,6 +1641,7 @@
                 :disabled="browseStatus"
                 :remote-method="corpsRemoteMethod"
                 placeholder="计价单位"
+                @change="changeFeeUnit(scope.row)"
               >
                 <el-option
                   v-for="(item, index) in fFeetunitOptions"
@@ -1980,7 +1982,6 @@
                   v-model.number="importList.fGrossweight"
                   v-input-limit="2"
                   style="width: 100%"
-                  disabled
                   placeholder="毛重"
                 />
               </el-form-item>
@@ -1991,7 +1992,6 @@
                   v-model.number="importList.fNetweight"
                   v-input-limit="2"
                   style="width: 100%"
-                  disabled
                   placeholder="毛重"
                 />
               </el-form-item>
@@ -3457,7 +3457,11 @@ export default {
           this.$set(this.form, "fStltypeid", this.form.fStltypeid.toString());
         }
         if (!this.copyStatus) {
-          this.detailList = response.data.warehouseBillsItem;
+          if(response.data.warehouseBillsItem){
+            this.detailList = response.data.warehouseBillsItem;
+          }else{
+            this.detailList = []
+          }
           response.data.warehousebillsfeesCr.map((e) => {
             if (e.fFeeunitid) {
               e.fFeeunitid = e.fFeeunitid.toString();
@@ -3482,6 +3486,8 @@ export default {
           }
         }else{ 
           this.$set(this.form, "fMblno", null);
+          this.$set(this.form, "fMarks", null);
+          this.$set(this.form, "fProductName", null);
         }
       });
     },
@@ -4289,6 +4295,30 @@ export default {
       }
       this.$set(row, "fAmount", Number(fUnitprice) * Number(fQty)).toFixed(2);
     },
+     // 变更计价单位
+    changeFeeUnit(row) {
+      if (!row.fFeeunitid) {
+        return false;
+      }
+      if (row.fFeeunitid === "2") {
+        this.$set(row, "fQty", (this.fGrossweight / 1000).toFixed(2));
+      } else if (row.fFeeunitid === "1") {
+        this.$set(row, "fQty", this.fQty.toFixed(2));
+      } else if (row.fFeeunitid === "3") {
+        this.$set(row, "fQty", (this.fNetweight / 1000).toFixed(2));
+      } else if (row.fFeeunitid === "7") {
+        this.$set(row, "fQty", this.fCntqty);
+      } else {
+        this.$set(row, "fQty", 0);
+      }
+      if (row.fUnitprice) {
+        this.$set(
+          row,
+          "fAmount",
+          parseFloat(Number(row.fUnitprice) * Number(row.fQty)).toFixed(2)
+        );
+      }
+    },
     //打印
     addprint(status) {
       if (status == "zyd") {

src/views/Warehousing/inStock/index.vue

@@ -10,64 +10,62 @@
       >
         <el-row>
           <el-col :span="6">
-            <el-form-item label="业务编号" prop="fBillno">
-              <el-input
-                v-model="queryParams.fBillno"
-                placeholder="请输入业务编号"
-                clearable
-                @keyup.enter.native="handleQuery"
-                style="width: 200px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="制单人" prop="createBy">
+            <el-form-item label="货权方" prop="fCorpid">
               <el-select
-                v-model="queryParams.createBy"
-                filterable
+                v-model="queryParams.fCorpid"
                 clearable
+                filterable
                 placeholder="请输入关键词"
                 style="width: 200px"
               >
                 <el-option
-                  v-for="(item, index) in userOptions"
-                  :key="index.userName"
-                  :label="item.nickName"
-                  :value="item.userName"
-                >
-                </el-option>
+                  v-for="(item, index) in fMblnoOptions"
+                  :key="index.fId"
+                  :label="item.fName"
+                  :value="item.fId"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="贸易方式" prop="fTrademodeid">
-              <el-select
-                v-model="queryParams.fTrademodeid"
-                placeholder="请选择贸易方式"
+            <el-form-item label="提单号" prop="fMblno">
+              <el-input
+                v-model="queryParams.fMblno"
+                placeholder="请输入提单号"
                 clearable
-                @keyup.enter.native="handleQuery"
                 style="width: 200px"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="入库日期" prop="timeInterval">
+              <el-date-picker
+                v-model="queryParams.timeInterval"
+                type="daterange"
+                value-format="yyyy-MM-dd"
+                clearable
+                style="width: 230px"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                @keyup.enter.native="handleQuery"
               >
-                <el-option
-                  v-for="(item, index) in fTrademodeidOptions"
-                  :key="index.dictValue"
-                  :label="item.dictLabel"
-                  :value="item.dictValue"
-                />
-              </el-select>
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="货权方" prop="fCorpid">
+            <el-form-item label="仓库" prop="fWarehouseid">
               <el-select
-                v-model="queryParams.fCorpid"
+                v-model="queryParams.fWarehouseid"
                 clearable
                 filterable
-                placeholder="请输入关键词"
+                placeholder="请选择仓库"
                 style="width: 200px"
+                @keyup.enter.native="handleQuery"
               >
                 <el-option
-                  v-for="(item, index) in fMblnoOptions"
+                  v-for="(item, index) in warehouseOptions"
                   :key="index.fId"
                   :label="item.fName"
                   :value="item.fId"
@@ -80,35 +78,6 @@
           <div v-show="show">
             <el-row>
               <el-col :span="6">
-                <el-form-item label="提单号" prop="fMblno">
-                  <el-input
-                    v-model="queryParams.fMblno"
-                    placeholder="请输入提单号"
-                    clearable
-                    style="width: 200px"
-                    @keyup.enter.native="handleQuery"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
-                <el-form-item label="经营单位" prop="fSbu">
-                  <el-select
-                    v-model="queryParams.fSbu"
-                    clearable
-                    filterable
-                    placeholder="请输入关键词"
-                    style="width: 200px"
-                  >
-                    <el-option
-                      v-for="(item, index) in fMblnoOptions"
-                      :key="index.fId"
-                      :label="item.fName"
-                      :value="item.fId"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="6">
                 <el-form-item label="货物名称" prop="fGoodsid">
                   <el-select
                     v-model="queryParams.fGoodsid"
@@ -128,27 +97,6 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="仓库" prop="fWarehouseid">
-                  <el-select
-                    v-model="queryParams.fWarehouseid"
-                    clearable
-                    filterable
-                    placeholder="请选择仓库"
-                    style="width: 200px"
-                    @keyup.enter.native="handleQuery"
-                  >
-                    <el-option
-                      v-for="(item, index) in warehouseOptions"
-                      :key="index.fId"
-                      :label="item.fName"
-                      :value="item.fId"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="6">
                 <el-form-item label="品牌" prop="fMarks">
                   <el-input
                     v-model="queryParams.fMarks"
@@ -160,6 +108,20 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
+                <el-form-item label="入库状态" prop="fItemsStatus">
+                  <el-select
+                    style="width: 200px"
+                    v-model="queryParams.fItemsStatus"
+                    placeholder="请选择入库状态"
+                  >
+                    <el-option label="计划" value="1"></el-option>
+                    <el-option label="待入库" value="2"></el-option>
+                    <el-option label="入库中" value="3"></el-option>
+                    <el-option label="已入库" value="4"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
                 <el-form-item label="费用状态" prop="fBillstatus">
                   <el-select
                     style="width: 200px"
@@ -175,34 +137,72 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row>
               <el-col :span="6">
-                <el-form-item label="入库状态" prop="fItemsStatus">
+                <el-form-item label="业务编号" prop="fBillno">
+                  <el-input
+                    v-model="queryParams.fBillno"
+                    placeholder="请输入业务编号"
+                    clearable
+                    @keyup.enter.native="handleQuery"
+                    style="width: 200px"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="制单人" prop="createBy">
                   <el-select
+                    v-model="queryParams.createBy"
+                    filterable
+                    clearable
+                    placeholder="请输入关键词"
                     style="width: 200px"
-                    v-model="queryParams.fItemsStatus"
-                    placeholder="请选择入库状态"
                   >
-                    <el-option label="计划" value="1"></el-option>
-                    <el-option label="待入库" value="2"></el-option>
-                    <el-option label="入库中" value="3"></el-option>
-                    <el-option label="已入库" value="4"></el-option>
+                    <el-option
+                      v-for="(item, index) in userOptions"
+                      :key="index.userName"
+                      :label="item.nickName"
+                      :value="item.userName"
+                    >
+                    </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="入库日期" prop="timeInterval">
-                  <el-date-picker
-                    v-model="queryParams.timeInterval"
-                    type="daterange"
-                    value-format="yyyy-MM-dd"
+                <el-form-item label="经营单位" prop="fSbu">
+                  <el-select
+                    v-model="queryParams.fSbu"
+                    clearable
+                    filterable
+                    placeholder="请输入关键词"
+                    style="width: 200px"
+                  >
+                    <el-option
+                      v-for="(item, index) in fMblnoOptions"
+                      :key="index.fId"
+                      :label="item.fName"
+                      :value="item.fId"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="贸易方式" prop="fTrademodeid">
+                  <el-select
+                    v-model="queryParams.fTrademodeid"
+                    placeholder="请选择贸易方式"
                     clearable
-                    style="width: 230px"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
                     @keyup.enter.native="handleQuery"
+                    style="width: 200px"
                   >
-                  </el-date-picker>
+                    <el-option
+                      v-for="(item, index) in fTrademodeidOptions"
+                      :key="index.dictValue"
+                      :label="item.dictLabel"
+                      :value="item.dictValue"
+                    />
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -386,7 +386,13 @@
         :summary-method="getSum"
       >
         <el-table-column type="selection" width="60" fixed align="center" />
-        <el-table-column type="index" label="行号" align="center" fixed />
+        <el-table-column
+          type="index"
+          label="行号"
+          width="50"
+          align="center"
+          fixed
+        />
         <el-table-column
           label="提单号"
           width="220"
@@ -420,6 +426,7 @@
           align="center"
           class-name="small-padding fixed-width"
           min-width="180"
+          fixed="right"
         >
           <template slot-scope="scope">
             <el-button
@@ -487,7 +494,7 @@
 
 <script>
 import AddOrUpdate from "./AddOrUpdate.vue";
-import { listWarehousebills } from "@/api/warehouseBusiness/warehouseInStock";
+import { listWarehousebills,delinStock_s } from "@/api/warehouseBusiness/warehouseInStock";
 import { listCorps } from "@/api/basicdata/corps";
 import { listWarehousesss } from "@/api/basicdata/warehouse";
 import { listGoods } from "@/api/basicdata/goods";
@@ -534,7 +541,6 @@ export default {
           label: "createBy",
           name: "制单人",
           checked: 0,
-          fixed: "left",
           width: 100,
         },
         {
@@ -566,7 +572,6 @@ export default {
           label: "fMarks",
           name: "品牌",
           checked: 0,
-          fixed: "left",
           width: 100,
         },
         {
@@ -666,7 +671,7 @@ export default {
       multiple: true,
       formId: null,
       ids: [],
-      copyStatus:null,
+      copyStatus: null,
     };
   },
   // 使用子组件
@@ -827,7 +832,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       const fId = row.fId || this.ids[0];
-      this.copyStatus=null
+      this.copyStatus = null;
       this.formId = fId;
       this.$nextTick(() => {
         this.$refs.addOrUpdateRef.init();
@@ -855,14 +860,34 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-      })
-        .then(function () {
-          return delFtmsorderbills(ids);
-        })
-        .then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        });
+      }).then(function () {
+        this.delFtmsorderbills(ids);
+      });
+    },
+    /** 删除按钮操作 */
+    delFtmsorderbills(ids) {
+      let tips = "";
+      delinStock_s(ids).then((data) => {
+        switch (data.msg) {
+          case "0": {
+            this.$message.error("当前数据已被其他操作员操作请刷新页面");
+            break;
+          }
+          case "1": {
+            tips = "当前主表有数据从表无数据是否删除";
+            this.delete_S(fIds, tips);
+            break;
+          }
+          case "2": {
+            tips = "当前主表有数据从表有数据是否删除";
+            this.delete_S(fIds, tips);
+            break;
+          }
+          default: {
+            return this.$message.error("未知错误，无状态");
+          }
+        }
+      });
     },
     /** 导出按钮操作 */
     handleExport() {