合并冲突

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -1098,9 +1098,7 @@
                 >复制录入</el-button
               >
               <el-button type="primary" size="small"> 下载模板 </el-button>
-              <el-button size="small" type="primary" @click="openUploadExcel"
-                >导入Execl</el-button
-              >
+              <el-button size="small" type="primary">导入Execl</el-button>
             </el-col>
             <el-col style="display: flex; justify-content: flex-end">
               <el-button size="small" type="info" prop="打印" @click="printZyd"
@@ -1677,7 +1675,12 @@
           "
         ></div>
         <div class="print_table" style="display: flex">
-          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%;line-height:30px">
+          <table
+            border="0"
+            cellspacing="0"
+            cellpadding="0"
+            style="width: 100%; line-height: 30px"
+          >
             <tr>
               <td>作业类型</td>
               <td colspan="2">
@@ -1769,7 +1772,12 @@
           {{ company }}有限公司收货单
         </div>
         <div class="print_table" style="display: flex">
-          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%;line-height:30px">
+          <table
+            border="0"
+            cellspacing="0"
+            cellpadding="0"
+            style="width: 100%; line-height: 30px"
+          >
             <tr>
               <td>车号</td>
               <td>{{ fTruckno }}</td>
@@ -1838,7 +1846,12 @@
           {{ company }}有限公司进仓单
         </div>
         <div class="print_table" style="display: flex">
-          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%;line-height:30px">
+          <table
+            border="0"
+            cellspacing="0"
+            cellpadding="0"
+            style="width: 100%; line-height: 30px"
+          >
             <tr>
               <td>客户</td>
               <td>{{ form.fCorpidName }}</td>
@@ -1960,7 +1973,12 @@
           {{ company }}有限公司入库单
         </div>
         <div class="print_table" style="display: flex">
-          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%;line-height:30px">
+          <table
+            border="0"
+            cellspacing="0"
+            cellpadding="0"
+            style="width: 100%; line-height: 30px"
+          >
             <tr>
               <td>客户名称</td>
               <td>{{ form.fCorpidName }}</td>
@@ -1989,7 +2007,7 @@
               <td>毛重</td>
               <td>规格</td>
               <td>区位</td>
-              <td style="width:20%">备注</td>
+              <td style="width: 20%">备注</td>
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
               <td>{{ item.fGoodsid | goodsFormat(goodsOptions) }}</td>
@@ -2053,7 +2071,12 @@
           {{ company }}有限公司入库单
         </div>
         <div class="print_table" style="display: flex">
-          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%;line-height:30px">
+          <table
+            border="0"
+            cellspacing="0"
+            cellpadding="0"
+            style="width: 100%; line-height: 30px"
+          >
             <tr>
               <td>客户名称</td>
               <td>{{ form.fCorpidName }}</td>
@@ -2082,7 +2105,7 @@
               <td>毛重</td>
               <td>规格</td>
               <td>区位</td>
-              <td style="width:20%">备注</td>
+              <td style="width: 20%">备注</td>
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
               <td>{{ item.fGoodsid | goodsFormat(goodsOptions) }}</td>
@@ -2180,7 +2203,12 @@
           </div>
         </div>
         <div class="print_table" style="display: flex">
-          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%;line-height:30px">
+          <table
+            border="0"
+            cellspacing="0"
+            cellpadding="0"
+            style="width: 100%; line-height: 30px"
+          >
             <tr>
               <td>箱号</td>
               <td>铅封号</td>
@@ -2267,7 +2295,12 @@
           <div>客户名称：{{ form.fCorpidName }}</div>
         </div>
         <div class="print_table" style="display: flex">
-          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%;line-height:30px">
+          <table
+            border="0"
+            cellspacing="0"
+            cellpadding="0"
+            style="width: 100%; line-height: 30px"
+          >
             <tr>
               <td>序号</td>
               <td>实际入库日期</td>
@@ -2353,7 +2386,12 @@
           </div>
         </div>
         <div class="print_table" style="display: flex">
-          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%;line-height:30px">
+          <table
+            border="0"
+            cellspacing="0"
+            cellpadding="0"
+            style="width: 100%; line-height: 30px"
+          >
             <tr>
               <td>品名</td>
               <td colspan="3">{{ form.fProductName }}</td>
@@ -2436,7 +2474,12 @@
           <div>入&nbsp;库&nbsp;计&nbsp;划&nbsp;单</div>
         </div>
         <div class="print_table" style="display: flex">
-          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%;line-height:30px">
+          <table
+            border="0"
+            cellspacing="0"
+            cellpadding="0"
+            style="width: 100%; line-height: 30px"
+          >
             <tr>
               <td>货物名称</td>
               <td colspan="2">{{ form.fProductName }}</td>
@@ -3035,7 +3078,12 @@
           垛卡
         </div>
         <div class="print_table" style="display: flex">
-          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%;line-height:30px">
+          <table
+            border="0"
+            cellspacing="0"
+            cellpadding="0"
+            style="width: 100%; line-height: 30px"
+          >
             <tr>
               <td>客户</td>
               <td colspan="2">{{ form.fCorpidName }}</td>
@@ -5159,6 +5207,11 @@ export default {
     },
     handleCommand(command) {
       if (this.Printinglist.length > 0) {
+        for (let item in this.Printinglist) {
+          if (!this.Printinglist[item].fId) {
+            return this.$message.error("请先保存!");
+          }
+        }
         this.$refs["form"].validate((valid) => {
           if (valid) {
             for (let corp in this.fMblnoOptions) {
@@ -5276,7 +5329,7 @@ export default {
                   ? "0" + date.getSeconds()
                   : date.getSeconds();
               this.rkTime = hours + ":" + minutes;
-              this.lsTime = hours + ":" + minutes + ":" + seconds;
+              this.lsTime = hours + "" + minutes + "" + seconds;
               this.print_bzrkd = true;
             } else if (command == "h") {
               this.print_dk = true;

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -786,11 +786,7 @@
               >
             </el-col>
             <el-col style="display: flex; justify-content: flex-end">
-              <el-button
-                size="small"
-                type="info"
-                prop="打印"
-                @click="printZyd"
+              <el-button size="small" type="info" prop="打印" @click="printZyd"
                 >作业单
               </el-button>
               <el-button
@@ -2067,7 +2063,12 @@
           "
         ></div>
         <div class="print_table" style="display: flex">
-          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%;line-height:30px">
+          <table
+            border="0"
+            cellspacing="0"
+            cellpadding="0"
+            style="width: 100%; line-height: 30px"
+          >
             <tr>
               <td>作业类型</td>
               <td colspan="2">
@@ -2086,7 +2087,7 @@
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
               <td>{{ item.fTruckno }}</td>
-              <td>{{ item.fGoodsid|goodsFormat(goodsOptions)}}</td>
+              <td>{{ item.fGoodsid | goodsFormat(goodsOptions) }}</td>
               <td>{{ item.fMblno }}</td>
               <td>
                 {{ item.fBusinessType | fStorageFormat }}/{{ item.fMarks }}
@@ -2159,7 +2160,12 @@
           {{ company }}有限公司出库单
         </div>
         <div class="print_table" style="display: flex">
-          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%;line-height:30px">
+          <table
+            border="0"
+            cellspacing="0"
+            cellpadding="0"
+            style="width: 100%; line-height: 30px"
+          >
             <tr>
               <td>客户</td>
               <td>{{ form.fCorpidName }}</td>
@@ -2187,7 +2193,7 @@
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
               <td>{{ item.fMblno }}</td>
-              <td>{{ item.fGoodsid|goodsFormat(goodsOptions)}}</td>
+              <td>{{ item.fGoodsid | goodsFormat(goodsOptions) }}</td>
               <td>{{ item.fCntrtype }}</td>
               <td>{{ item.fMarks }}</td>
               <td>{{ item.fQty }}</td>
@@ -2281,13 +2287,18 @@
           {{ company }}有限公司出库单
         </div>
         <div class="print_table" style="display: flex">
-          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%;line-height:30px">
+          <table
+            border="0"
+            cellspacing="0"
+            cellpadding="0"
+            style="width: 100%; line-height: 30px"
+          >
             <tr>
               <td>公司名称</td>
               <td colspan="3">{{ form.fCorpidName }}</td>
               <td>出库日期</td>
               <td colspan="2" v-if="Printinglist.length">
-                {{ Printinglist[0].fBsdate | fBsdateFormat }}{{" " + ckTime}}
+                {{ Printinglist[0].fBsdate | fBsdateFormat }}{{ " " + ckTime }}
               </td>
               <td colspan="2" v-else></td>
             </tr>
@@ -2301,7 +2312,7 @@
               <td>备注</td>
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
-              <td>{{ item.fGoodsid|goodsFormat(goodsOptions)}}</td>
+              <td>{{ item.fGoodsid | goodsFormat(goodsOptions) }}</td>
               <td>{{ item.fMblno }}</td>
               <td>{{ item.fCntrno }}</td>
               <td>{{ item.fQty }}</td>
@@ -2410,7 +2421,12 @@
           </div>
         </div>
         <div class="print_table" style="display: flex">
-          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%;line-height:30px">
+          <table
+            border="0"
+            cellspacing="0"
+            cellpadding="0"
+            style="width: 100%; line-height: 30px"
+          >
             <tr>
               <td>箱号</td>
               <td>铅封号</td>
@@ -2500,7 +2516,12 @@
           </div>
         </div>
         <div class="print_table" style="display: flex">
-          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%;line-height:30px">
+          <table
+            border="0"
+            cellspacing="0"
+            cellpadding="0"
+            style="width: 100%; line-height: 30px"
+          >
             <tr>
               <td>品名</td>
               <td colspan="3">{{ form.fProductName }}</td>
@@ -2589,7 +2610,12 @@
         </div>
 
         <div class="print_table" style="display: flex">
-          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%;line-height:30px">
+          <table
+            border="0"
+            cellspacing="0"
+            cellpadding="0"
+            style="width: 100%; line-height: 30px"
+          >
             <tr>
               <td>品名</td>
               <td colspan="2">{{ form.fProductName }}</td>
@@ -2692,7 +2718,12 @@
           <div style="margin-left: 250px">存放地点：{{ stockName }}</div>
         </div>
         <div class="print_table" style="display: flex">
-          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%;line-height:30px">
+          <table
+            border="0"
+            cellspacing="0"
+            cellpadding="0"
+            style="width: 100%; line-height: 30px"
+          >
             <tr>
               <td>品名</td>
               <td colspan="2">{{ form.fProductName }}</td>
@@ -2786,7 +2817,12 @@
           <div style="margin-left: 250px">存放地点：{{ stockName }}</div>
         </div>
         <div class="print_table" style="display: flex">
-          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%;line-height:30px">
+          <table
+            border="0"
+            cellspacing="0"
+            cellpadding="0"
+            style="width: 100%; line-height: 30px"
+          >
             <tr>
               <td>品名</td>
               <td colspan="3">{{ form.fProductName }}</td>
@@ -2995,23 +3031,14 @@
         @click="addOrUpdateHand(form, 'f_billstatus')"
         >审批</el-button
       >
-      <el-button
-        type="success"
-        prop="打印"
-        @click="print_shd = true"
+      <el-button type="success" prop="打印" @click="print_shd = true"
         >收货单
       </el-button>
-      <el-button
-        type="warning"
-        prop="打印"
-        @click="print_rkd = true"
+      <el-button type="warning" prop="打印" @click="print_rkd = true"
         >出库单
       </el-button>
       <el-button @click="discharge" :disabled="browseStatus">卸货</el-button>
-      <el-button
-        type="info"
-        prop="打印"
-        @click="print_zyd = true"
+      <el-button type="info" prop="打印" @click="print_zyd = true"
         >作业单
       </el-button>
       <el-button :disabled="browseStatus" type="primary" @click="saveForm()"
@@ -5254,6 +5281,11 @@ export default {
     },
     handleCommand(command) {
       if (this.Printinglist.length > 0) {
+        for (let item in this.Printinglist) {
+          if (!this.Printinglist[item].fId) {
+            return this.$message.error("请先保存!");
+          }
+        }
         this.$refs["form"].validate((valid) => {
           if (valid) {
             for (let corp in this.fMblnoOptions) {
@@ -5318,7 +5350,7 @@ export default {
                 date.getMinutes() < 10
                   ? "0" + date.getMinutes()
                   : date.getMinutes();
-              this.ckTime = hours + ":" + minutes ;
+              this.ckTime = hours + ":" + minutes;
               this.print_bzckd = true;
             } else if (command == "e") {
               this.print_lwqr = true;

src/views/reportManagement/whgenleg/index.vue

@@ -49,7 +49,7 @@
       </el-form-item>
       <el-form-item label="入库日期" prop="createTime">
         <el-date-picker
-          v-model="queryParams.timeInterval"
+          v-model="queryParams.orgStorageDate"
           type="daterange"
           value-format="yyyy-MM-dd"
           clearable
@@ -434,6 +434,7 @@ export default {
         fCntrno: null,
         fStatus: null,
         fMarks: null,
+        orgStorageDate: null,
         fBusinessType: null,
         fBusinessTypes: null,
       },