qukaidi 4 years ago
parent
commit
f21cbc61fe

+ 63 - 64
src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div style="display:flex;justify-content: space-between;">
+    <div style="display: flex; justify-content: space-between">
       <div style="display: flex; align-items: center">
         <el-breadcrumb separator="/">
           <el-breadcrumb-item
@@ -469,70 +469,69 @@
         </el-col>
         <el-col :span="8">
           <el-form-item>
-            <el-table
-              :data="CntrTable"
-              style="width: 80%"
-              :header-cell-style="{ lineHeight: '16px' }"
-              height="139"
-            >
-              <el-table-column
-                prop="fCntrid "
-                label="箱型"
-                header-align="center"
-                align="center"
+            <div style="display:flex;align-items: center;">
+              <el-table
+                :data="CntrTable"
+                style="width: 80%"
+                :header-cell-style="{ lineHeight: '16px' }"
               >
-                <template slot-scope="scope">
-                  <el-select
-                    placeholder="请选择箱型"
-                    v-model="scope.row.fCntrid"
-                    size="mini"
-                  >
-                    <el-option
-                      v-for="(item, index) in cntrList"
-                      :key="index.fId"
-                      :label="item.fName"
-                      :value="item.fId"
+                <el-table-column
+                  prop="fCntrid "
+                  label="箱型"
+                  header-align="center"
+                  align="center"
+                >
+                  <template slot-scope="scope">
+                    <el-select
+                      placeholder="请选择箱型"
+                      v-model="scope.row.fCntrid"
+                      size="mini"
                     >
-                    </el-option>
-                  </el-select>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="fCntrcount"
-                label="箱量"
-                header-align="center"
-                align="center"
-              >
-                <template slot-scope="scope">
-                  <el-input
-                    placeholder="请输入箱量"
-                    v-model="scope.row.fCntrcount"
-                    size="mini"
-                  >
-                  </el-input>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="fCntrcount"
-                label="操作"
-                header-align="center"
-                align="center"
-                width="50"
-              >
-                <template slot-scope="scope">
-                  <el-button
-                    size="mini"
-                    type="text"
-                    @click.native.prevent="deleteRow(scope.$index, CntrTable)"
-                    icon="el-icon-delete"
-                  ></el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-            <div style="display: flex; justify-content: center; width: 80%">
+                      <el-option
+                        v-for="(item, index) in cntrList"
+                        :key="index.fId"
+                        :label="item.fName"
+                        :value="item.fId"
+                      >
+                      </el-option>
+                    </el-select>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="fCntrcount"
+                  label="箱量"
+                  header-align="center"
+                  align="center"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      placeholder="请输入箱量"
+                      v-model="scope.row.fCntrcount"
+                      size="mini"
+                    >
+                    </el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="fCntrcount"
+                  label="操作"
+                  header-align="center"
+                  align="center"
+                  width="50"
+                >
+                  <template slot-scope="scope">
+                    <el-button
+                      size="mini"
+                      type="text"
+                      @click.native.prevent="deleteRow(scope.$index, CntrTable)"
+                      icon="el-icon-delete"
+                    ></el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
               <el-tag class="tag-hover" @click="addRow"
-                ><i class="el-icon-plus"></i
-              ></el-tag>
+                  ><i class="el-icon-plus"></i
+                ></el-tag>
             </div>
           </el-form-item>
         </el-col>
@@ -5126,9 +5125,9 @@ export default {
 }
 .tag-hover {
   border-top-left-radius: 0;
-  border-top-right-radius: 0;
+  border-bottom-left-radius: 0;
   height: 15px;
-  padding: 0px 4px;
+  padding: 0px 1px;
   line-height: 12px;
 }
 .print-div {

+ 1 - 1
src/views/Warehousing/inStock/index.vue

@@ -385,7 +385,7 @@
         show-summary
         :summary-method="getSum"
       >
-        <el-table-column type="selection" width="60" fixed align="center" />
+        <el-table-column type="selection" width="50" fixed align="center" />
         <el-table-column
           type="index"
           label="行号"

+ 135 - 64
src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -389,67 +389,66 @@
         </el-col>
         <el-col :span="8">
           <el-form-item>
-            <el-table
-              :data="CntrTable"
-              style="width: 80%"
-              :header-cell-style="{ lineHeight: '16px' }"
-              height="139"
-            >
-              <el-table-column
-                prop="fCntrid "
-                label="箱型"
-                header-align="center"
-                align="center"
+            <div style="display: flex; align-items: center">
+              <el-table
+                :data="CntrTable"
+                style="width: 80%"
+                :header-cell-style="{ lineHeight: '16px' }"
               >
-                <template slot-scope="scope">
-                  <el-select
-                    placeholder="请选择箱型"
-                    v-model="scope.row.fCntrid"
-                    size="mini"
-                  >
-                    <el-option
-                      v-for="(item, index) in cntrList"
-                      :key="index.fId"
-                      :label="item.fName"
-                      :value="item.fId"
+                <el-table-column
+                  prop="fCntrid "
+                  label="箱型"
+                  header-align="center"
+                  align="center"
+                >
+                  <template slot-scope="scope">
+                    <el-select
+                      placeholder="请选择箱型"
+                      v-model="scope.row.fCntrid"
+                      size="mini"
                     >
-                    </el-option>
-                  </el-select>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="fCntrcount"
-                label="箱量"
-                header-align="center"
-                align="center"
-              >
-                <template slot-scope="scope">
-                  <el-input
-                    placeholder="请输入箱量"
-                    v-model="scope.row.fCntrcount"
-                    size="mini"
-                  >
-                  </el-input>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="fCntrcount"
-                label="操作"
-                header-align="center"
-                align="center"
-                width="50"
-              >
-                <template slot-scope="scope">
-                  <el-button
-                    size="mini"
-                    type="text"
-                    @click.native.prevent="deleteRow(scope.$index, CntrTable)"
-                    icon="el-icon-delete"
-                  ></el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-            <div style="display: flex; justify-content: center; width: 80%">
+                      <el-option
+                        v-for="(item, index) in cntrList"
+                        :key="index.fId"
+                        :label="item.fName"
+                        :value="item.fId"
+                      >
+                      </el-option>
+                    </el-select>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="fCntrcount"
+                  label="箱量"
+                  header-align="center"
+                  align="center"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      placeholder="请输入箱量"
+                      v-model="scope.row.fCntrcount"
+                      size="mini"
+                    >
+                    </el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="fCntrcount"
+                  label="操作"
+                  header-align="center"
+                  align="center"
+                  width="50"
+                >
+                  <template slot-scope="scope">
+                    <el-button
+                      size="mini"
+                      type="text"
+                      @click.native.prevent="deleteRow(scope.$index, CntrTable)"
+                      icon="el-icon-delete"
+                    ></el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
               <el-tag class="tag-hover" @click="addRow"
                 ><i class="el-icon-plus"></i
               ></el-tag>
@@ -1852,7 +1851,60 @@
       style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
       :visible.sync="whgenlegVisible"
       width="70%"
+      @close="init2()"
     >
+      <el-form
+        ref="whgenlegParams"
+        :model="whgenlegParams"
+        :rules="rules2"
+        label-width="120px"
+      >
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="提单号" prop="fMblno">
+              <el-input
+                v-model="whgenlegParams.fMblno"
+                placeholder="请输入提单号"
+                clearable
+                style="width: 80%"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="箱号" prop="fCntrno">
+              <el-input
+                v-model="whgenlegParams.fCntrno"
+                placeholder="请输入箱号"
+                clearable
+                style="width: 80%"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="10">
+            <el-form-item label="入库日期区间" prop="orgStorageDate">
+              <el-date-picker
+                style="width: 80%"
+                v-model="whgenlegParams.orgStorageDate"
+                type="daterange"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :default-time="['00:00:00', '23:59:59']"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="2">
+            <el-button
+              type="cyan"
+              icon="el-icon-search"
+              @click="getWhgenlegList()"
+              >搜索</el-button
+            >
+          </el-col>
+        </el-row>
+      </el-form>
+
       <el-table
         :data="whgenlegList"
         ref="table"
@@ -1933,7 +1985,7 @@
         @pagination="getWhgenlegList"
       />
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="whgenlegData">导入库存总账</el-button>
+        <el-button type="primary" @click="whgenlegData()">导入库存总账</el-button>
         <el-button @click="whgenlegVisible = false">取 消</el-button>
       </div>
     </el-dialog>
@@ -2603,7 +2655,7 @@ export default {
     Treeselect,
     AddOrUpdate,
     ApprovalComments,
-    draggable
+    draggable,
   },
   data() {
     return {
@@ -2638,6 +2690,11 @@ export default {
         fTocorpid: [{ required: true, message: " ", trigger: "blur" }],
         fFeetUnit: [{ required: true, message: " ", trigger: "blur" }],
       },
+      rules2: {
+        fCorpid: [{ required: true, message: " ", trigger: "blur" }],
+        fWarehouseid: [{ required: true, message: " ", trigger: "blur" }],
+        fTrademodeid: [{ required: true, message: " ", trigger: "blur" }],
+      },
       browseStatus: false,
       goodsOptions: [],
       warehouseOptions: [],
@@ -2718,10 +2775,12 @@ export default {
       whgenlegParams: {
         pageNum: 1,
         pageSize: 10,
-        fMblno: null,
         fCorpid: null,
         fWarehouseid: null,
         fTruckno: null,
+        fCntrno: null,
+        fMblno: null,
+        orgStorageDate: null,
       },
       stockoi: null,
       drag: false,
@@ -3008,6 +3067,18 @@ export default {
       this.CntrTable = [];
       this.getForm();
     },
+    init2() {
+      this.whgenlegParams = {
+        pageNum: 1,
+        pageSize: 10,
+        fCorpid: null,
+        fWarehouseid: null,
+        fTruckno: null,
+        fCntrno: null,
+        fMblno: null,
+        orgStorageDate: null,
+      };
+    },
     //列设置全选
     allChecked() {
       if (this.allCheck == true) {
@@ -4616,9 +4687,9 @@ export default {
 }
 .tag-hover {
   border-top-left-radius: 0;
-  border-top-right-radius: 0;
+  border-bottom-left-radius: 0;
   height: 15px;
-  padding: 0px 4px;
+  padding: 0px 1px;
   line-height: 12px;
 }
 .print-div {

+ 1 - 1
src/views/Warehousing/outStock/index.vue

@@ -385,7 +385,7 @@
         show-summary
         :summary-method="getSum"
       >
-        <el-table-column type="selection" width="60" fixed align="center" />
+        <el-table-column type="selection" width="50" fixed align="center" />
         <el-table-column
           type="index"
           label="行号"

+ 68 - 63
src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -383,67 +383,66 @@
         </el-col>
         <el-col :span="8">
           <el-form-item>
-            <el-table
-              :data="CntrTable"
-              style="width: 80%"
-              :header-cell-style="{ lineHeight: '16px' }"
-              height="139"
-            >
-              <el-table-column
-                prop="fCntrid "
-                label="箱型"
-                header-align="center"
-                align="center"
+            <div style="display: flex; align-items: center">
+              <el-table
+                :data="CntrTable"
+                style="width: 80%"
+                :header-cell-style="{ lineHeight: '16px' }"
               >
-                <template slot-scope="scope">
-                  <el-select
-                    placeholder="请选择箱型"
-                    v-model="scope.row.fCntrid"
-                    size="mini"
-                  >
-                    <el-option
-                      v-for="(item, index) in cntrList"
-                      :key="index.fId"
-                      :label="item.fName"
-                      :value="item.fId"
+                <el-table-column
+                  prop="fCntrid "
+                  label="箱型"
+                  header-align="center"
+                  align="center"
+                >
+                  <template slot-scope="scope">
+                    <el-select
+                      placeholder="请选择箱型"
+                      v-model="scope.row.fCntrid"
+                      size="mini"
                     >
-                    </el-option>
-                  </el-select>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="fCntrcount"
-                label="箱量"
-                header-align="center"
-                align="center"
-              >
-                <template slot-scope="scope">
-                  <el-input
-                    placeholder="请输入箱量"
-                    v-model="scope.row.fCntrcount"
-                    size="mini"
-                  >
-                  </el-input>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="fCntrcount"
-                label="操作"
-                header-align="center"
-                align="center"
-                width="50"
-              >
-                <template slot-scope="scope">
-                  <el-button
-                    size="mini"
-                    type="text"
-                    @click.native.prevent="deleteRow(scope.$index, CntrTable)"
-                    icon="el-icon-delete"
-                  ></el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-            <div style="display: flex; justify-content: center; width: 80%">
+                      <el-option
+                        v-for="(item, index) in cntrList"
+                        :key="index.fId"
+                        :label="item.fName"
+                        :value="item.fId"
+                      >
+                      </el-option>
+                    </el-select>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="fCntrcount"
+                  label="箱量"
+                  header-align="center"
+                  align="center"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      placeholder="请输入箱量"
+                      v-model="scope.row.fCntrcount"
+                      size="mini"
+                    >
+                    </el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="fCntrcount"
+                  label="操作"
+                  header-align="center"
+                  align="center"
+                  width="50"
+                >
+                  <template slot-scope="scope">
+                    <el-button
+                      size="mini"
+                      type="text"
+                      @click.native.prevent="deleteRow(scope.$index, CntrTable)"
+                      icon="el-icon-delete"
+                    ></el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
               <el-tag class="tag-hover" @click="addRow"
                 ><i class="el-icon-plus"></i
               ></el-tag>
@@ -2337,7 +2336,13 @@
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" :disabled="browseStatus" @click="addprint();print_ykd = false"
+        <el-button
+          type="primary"
+          :disabled="browseStatus"
+          @click="
+            addprint();
+            print_ykd = false;
+          "
           >打印
         </el-button>
         <el-button @click="print_ykd = false">取消 </el-button>
@@ -2646,7 +2651,7 @@ export default {
       print_zyd: false,
       print_shd: false,
       print_rkd: false,
-      print_ykd:false,
+      print_ykd: false,
       company: "",
       Printinglist: [],
       //库位
@@ -4368,9 +4373,9 @@ export default {
 }
 .tag-hover {
   border-top-left-radius: 0;
-  border-top-right-radius: 0;
+  border-bottom-left-radius: 0;
   height: 15px;
-  padding: 0px 4px;
+  padding: 0px 1px;
   line-height: 12px;
 }
 .print-div {

+ 1 - 1
src/views/Warehousing/stockTransfer/index.vue

@@ -385,7 +385,7 @@
         show-summary
         :summary-method="getSum"
       >
-        <el-table-column type="selection" width="60" fixed align="center" />
+        <el-table-column type="selection" width="50" fixed align="center" />
         <el-table-column
           type="index"
           label="行号"

+ 24 - 5
src/views/reportManagement/whgenleg/index.vue

@@ -216,7 +216,7 @@
         width="100"
         fixed
       />
-      <el-table-column
+      <!-- <el-table-column
         label="提单号"
         sortable
         align="center"
@@ -231,7 +231,7 @@
             }}</el-link>
           </div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
         v-for="(item, index) in getRowList"
         :key="index"
@@ -242,7 +242,18 @@
         :show-overflow-tooltip="true"
         sortable
         :fixed="item.fixed"
-      />
+      >
+        <template slot-scope="scope">
+          <span v-if="item.label == 'fMblno'">
+            <el-link :underline="false" type="primary"
+              ><div @click="goDetail(scope.row)">
+                {{ scope.row.fMblno }}
+              </div></el-link
+            >
+          </span>
+          <span v-else>{{ scope.row[item.label] }}</span>
+        </template>
+      </el-table-column>
       <!-- </el-table-column>
       <el-table-column
         label="客户"
@@ -585,6 +596,14 @@ export default {
       setRowList: [],
       getRowList: [],
       tableDate: [
+          {
+          surface: "0",
+          label: "fMblno",
+          name: "提单号",
+          checked: 0,
+          width: 100,
+          fixed: "left",
+        },
         {
           surface: "1",
           label: "fCorpid",
@@ -773,7 +792,7 @@ export default {
             return res;
           }, []);
         }
-        console.log(this.getRowList)
+        console.log(this.getRowList);
       });
     },
     delRow() {
@@ -787,7 +806,7 @@ export default {
           this.setRowList = this.tableDate;
           this.getRowList = this.tableDate;
 
-          console.log(this.getRowList)
+          console.log(this.getRowList);
         }
       });
     },