Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

src/views/drFPTX/RAList.vue

@@ -21,7 +21,10 @@
           @click.native.prevent="clickitemdataType(2)"
         >案件</el-radio>
       </el-radio-group> -->
-      <div class="headLeft" style="display: flex;">
+      <div
+        class="headLeft"
+        style="display: flex;"
+      >
         <div class='search barcode'>
           <div class='item'> 条码号：</div>
           <el-input
@@ -94,7 +97,7 @@
             </el-option>
           </el-select>
         </div>
-      <!-- <div class="search sjxz">
+        <div class="search sjxz">
           <div class="item">时间选择：</div>
           <el-date-picker
             @keyup.enter.native="search"
@@ -107,10 +110,15 @@
               }"
           >
           </el-date-picker>
-      </div> -->
+        </div>
       </div>
       <div class="headRight">
         <el-button
+          v-show="barcode!=''||ruleForm.logicDatabase!=''||taskNumber!=''||status!=null||startEndDate!=null"
+          type="text"
+          @click="clear"
+        >清空</el-button>
+        <el-button
           class="sx"
           @click="search"
         >筛选</el-button>
@@ -188,16 +196,31 @@
           </el-option>
         </el-select>
       </div>
-      <!-- <div class='search sjxz'>
+      <div class='search sjxz'>
         <div class='item'> 时间选择：</div>
         <el-date-picker
+          @keyup.enter.native="search"
           v-model="startEndDate"
-          type="datetimerange"
+          type="daterange"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
+          :picker-options="{
+                disabledDate: disabledDate,
+              }"
         >
         </el-date-picker>
-      </div> -->
+      </div>
+      <div class="headRight">
+        <el-button
+          v-show="barcode!=''||queryType!=''||logicDatabase!=''||status!=null||startEndDate!=null"
+          type="text"
+          @click="clear"
+        >清空</el-button>
+        <el-button
+          class="sx"
+          @click="search"
+        >筛选</el-button>
+      </div>
     </div>
     <!-- 二 -->
     <div class="buttons">
@@ -598,8 +621,10 @@
       >
         <template slot-scope="scope">
           <div style="display: flex;flex-direction: row;">
-            <div v-if="scope.row.srcBarcode && scope.row.destBarcode !== ''"
-              style="margin-top:6px;margin-right: 5px;">
+            <div
+              v-if="scope.row.srcBarcode && scope.row.destBarcode !== ''"
+              style="margin-top:6px;margin-right: 5px;"
+            >
               <div style="width: 7px;height: 7px;background: #FFFFFF;border: 1px solid #006AFF;border-radius: 50%;"></div>
               <div style="width: 1px;height: 15px;background: #D8D8D8;margin-left: 3px;"></div>
               <div style="width: 7px;height: 7px;background: #FFFFFF;border: 1px solid #006AFF;border-radius: 50%;"></div>
@@ -621,8 +646,10 @@
 
         <template slot-scope="scope">
           <div style="display: flex;flex-direction: row;">
-            <div  v-if="scope.row.srcLogicName && scope.row.destLogicName !== ''"
-                style="margin-top:6px;margin-right: 5px;">
+            <div
+              v-if="scope.row.srcLogicName && scope.row.destLogicName !== ''"
+              style="margin-top:6px;margin-right: 5px;"
+            >
               <div style="width: 7px;height: 7px;background: #FFFFFF;border: 1px solid #006AFF;border-radius: 50%;"></div>
               <div style="width: 1px;height: 15px;background: #D8D8D8;margin-left: 3px;"></div>
               <div style="width: 7px;height: 7px;background: #FFFFFF;border: 1px solid #006AFF;border-radius: 50%;"></div>
@@ -940,7 +967,7 @@ export default {
       this.selectBoo = false// 是否批量操作
       this.isShowTip = false;
       this.multipleSelection = [];
-      this.search();
+      // this.search();
       this.clear()
     },
   },
@@ -1137,6 +1164,7 @@ export default {
       this.status = null; // 状态
       this.barcode = ""; // 条码号
       this.ruleForm.logicDatabase = "";// 逻辑分库
+      this.logicDatabase = ''; // 逻辑分库
       this.queryType = "";// 类型
       this.startEndDate = null;// 时间
       this.search()
@@ -1600,9 +1628,9 @@ export default {
     },
   },
   mounted () {
-    this.search();
     //console.log(this.$route.query.id, 'this.$route.query.id')
     this.showType = this.$route.query.id || "1";
+    // this.search();
 
   },
 };
@@ -1668,7 +1696,7 @@ export default {
       font-family: HarmonyOS_Sans_SC;
       color: #ffffff;
       line-height: 22px;
-      border:none
+      border: none;
     }
 
     /deep/.el-radio-button .el-radio-button__inner {
@@ -1764,6 +1792,7 @@ export default {
     }
     .sjxz {
       margin-left: 24px;
+      width: 370px;
       .item {
         width: 80px;
         font-size: 14px;
@@ -1786,7 +1815,7 @@ export default {
     margin-bottom: 16px;
     .left {
       margin-top: 24px;
-      .el-radio-group{
+      .el-radio-group {
         .el-radio {
           width: 86px;
           height: 32px;
@@ -1809,14 +1838,12 @@ export default {
           /deep/ .el-radio__input {
             display: none;
           }
-          
         }
         /deep/ .is-checked {
           background-color: #ddebff;
         }
       }
     }
-    
   }
 
   .options {

src/views/zljc/Index.vue

@@ -76,6 +76,7 @@
       </div>
       <div class="right">
         <el-button
+          v-show="formInline.barcode!=''||formInline.inspectionFlag!=null||formInline.codeDwCode!=''||formInline.nysj!=null"
           type="text"
           @click="clear"
         >清空</el-button>

src/views/zljc/modules/nyzw.vue

@@ -467,7 +467,7 @@ export default {
       let self = this;
       this.$axios
         .post(
-          "/api/png/plainByBarcode/barcode",
+          "/api/png/plain/barcode",
           { barcode: this.rowData.barcode },
           // { loading: false }
         )
@@ -502,7 +502,7 @@ export default {
       let self = this;
       this.$axios
         .post(
-          "/api/png/rollByBarcode/barcode",
+          "/api/png/roll/barcode",
           { barcode: this.rowData.barcode },
           // { loading: false }
         )
@@ -790,7 +790,7 @@ export default {
         position: absolute;
         left: 50%;
         top: 50%;
-        transform:translate(-50%,-50%);
+        transform: translate(-50%, -50%);
         margin-top: -48px; /* 高度的一半 */
         margin-left: -66px; /* 宽度的一半 */
         width: 132px;
@@ -876,7 +876,7 @@ export default {
         position: absolute;
         left: 50%;
         top: 50%;
-        transform:translate(-50%,-50%);
+        transform: translate(-50%, -50%);
         margin-top: -48px; /* 高度的一半 */
         margin-left: -66px; /* 宽度的一半 */
         width: 132px;