Merge branch 'blueBranch' into redUrgent

# Conflicts:
#	src/HDrpManagement/prodectFileData/components/add.vue

src/HDrpManagement/prodectFileData/components/add.vue

@@ -10,64 +10,68 @@
         append-to-body
     >
       <div class="drawer__panel" style="margin-top: 0;margin-bottom: 0;padding-top: 0">
-      <search class="inline-16" @searchActive="searchActive" :placeholder="placeholder" style="padding-left: 0"></search>
-      <uploadAllData
-        class="inline-16"
-        :total="total"
-        @handlePullApi="handlePullApi"
-        @handleUploadApi="handleUploadApi"
-        @onSuccess="onSuccess"
-      ></uploadAllData>
-      <selectClass ref="class" @clickAreaBase="clickAreaBase" @brandChange="brandChange" @onClassChange="onClassChange" @Search="Search" @clearSearch="clearSearch" @clickField="clickField" :default="true"></selectClass>
-      <div>
-        <tablelayout :layout="tablecols" :data="productsList" :custom="true" :checkbox="true" height="calc(100vh - 392px)" @checkboxCallBack="checkboxCallBack">
-          <template v-slot:customcol="scope">
-            <div v-if="scope.column.columnname === 'province'">
-              <span>{{scope.column.data.province}} - {{scope.column.data.city}} - {{scope.column.data.county}}</span>
-            </div>
-            <div v-else-if="scope.column.columnname === 'isonsale'" :style="{color:scope.column.data[scope.column.columnname] === 1?tool.getStatusColor('上架',true):tool.getStatusColor('下架',true)}">
-              <span>{{scope.column.data.isonsale ? $t('上架') : $t('下架')}}</span>
-            </div>
-            <p v-else-if="scope.column.columnname === 'status'">
-              <span :style="tool.getStatusColor(scope.column.data[[scope.column.columnname]])">{{$t(scope.column.data[[scope.column.columnname]])}}</span>
-            </p>
-            <p v-else-if="scope.column.columnname === 'itemclass'">
-              <span v-if="JSON.stringify(scope.column.data.itemclass) !== '[]' && scope.column.data.itemclass">
-                 <span v-for="item in scope.column.data.itemclass" :key="item.index">
-                   <el-tag style="margin-right: 10px;margin-top: 5px;margin-bottom: 5px" type="success">{{$t(item.itemclassfullname)}}</el-tag>
+        <div style="margin-top: 20px;margin-bottom: 10px">
+          <uploadAllData
+              class="inline-16"
+              :total="total"
+              @handlePullApi="handlePullApi"
+              @handleUploadApi="handleUploadApi"
+              @onSuccess="onSuccess"
+          ></uploadAllData>
+          <el-input style="width:200px;" :placeholder="$t('搜索')" :suffix-icon="params.content.where.condition?params.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="params.content.where.condition" @keyup.native.enter="productsData(params.content.pageNumber = 1)" @clear="productsData(params.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+          </el-input>
+        </div>
+
+        <selectClass ref="class" @clickAreaBase="clickAreaBase" @brandChange="brandChange" @onClassChange="onClassChange" @Search="Search" @clearSearch="clearSearch" @clickField="clickField" :default="true"></selectClass>
+        <div>
+          <tablelayout :layout="tablecols" :data="productsList" :custom="true" :checkbox="true" height="calc(100vh - 392px)" @checkboxCallBack="checkboxCallBack">
+            <template v-slot:customcol="scope">
+              <div v-if="scope.column.columnname === 'province'">
+                <span>{{scope.column.data.province}} - {{scope.column.data.city}} - {{scope.column.data.county}}</span>
+              </div>
+              <div v-else-if="scope.column.columnname === 'isonsale'" :style="{color:scope.column.data[scope.column.columnname] === 1?tool.getStatusColor('上架',true):tool.getStatusColor('下架',true)}">>
+                <span>{{scope.column.data.isonsale ? $t('上架') : $t('下架')}}</span>
+              </div>
+              <p v-else-if="scope.column.columnname === 'status'">
+                <span :style="tool.getStatusColor(scope.column.data[[scope.column.columnname]])">{{$t(scope.column.data[[scope.column.columnname]])}}</span>
+              </p>
+              <p v-else-if="scope.column.columnname === 'itemclass'">
+                <span v-if="JSON.stringify(scope.column.data.itemclass) !== '[]' && scope.column.data.itemclass">
+                   <span v-for="item in scope.column.data.itemclass" :key="item.index">
+                     <el-tag style="margin-right: 10px;margin-top: 5px;margin-bottom: 5px" type="success">{{$t(item.itemclassfullname)}}</el-tag>
+                  </span>
                 </span>
-              </span>
-              <span v-else>
-                --
-              </span>
-            </p>
-            <div v-else-if="scope.column.columnname === 'nominalpressure'">
-              {{tool.nominalPressureSet(scope.column.data.nominalpressure)}}
-            </div>
-            <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
-          </template>
+                <span v-else>
+                  --
+                </span>
+              </p>
+              <div v-else-if="scope.column.columnname === 'nominalpressure'">
+                {{tool.nominalPressureSet(scope.column.data.nominalpressure)}}
+              </div>
+              <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
+            </template>
 
-        </tablelayout>
+          </tablelayout>
 
-      </div>
-      <div>
-        <div style="margin-top: 10px;float: left">{{$t(`已选`)}} {{selected}} {{$t(`个商品，共`)}} {{total}} {{$t(`个商品`)}}</div>
-        <div  style="margin-top: 10px;text-align:right">
-          <el-pagination
-              background
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
-              :current-page="params.content.pageNumber"
-              :page-sizes="[20, 50, 100, 200]"
-              layout="total,sizes, prev, pager, next, jumper"
-              :total="total">
-          </el-pagination>
         </div>
-      </div>
-      <div class="dialog-footer">
-        <el-button size="small" @click="drawer = false" class="normal-btn-width">{{$t(`取消`)}}</el-button>
-        <el-button size="small" type="primary" @click="onSubmit"  class="normal-btn-width btn-primary">{{$t(`确定`)}}</el-button>
-      </div>
+        <div>
+          <div style="margin-top: 10px;float: left">{{$t(`已选`)}} {{selected}} {{$t(`个商品，共`)}} {{total}} {{$t(`个商品`)}}</div>
+          <div  style="margin-top: 10px;text-align:right">
+            <el-pagination
+                background
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :current-page="params.content.pageNumber"
+                :page-sizes="[20, 50, 100, 200]"
+                layout="total,sizes, prev, pager, next, jumper"
+                :total="total">
+            </el-pagination>
+          </div>
+        </div>
+        <div class="dialog-footer">
+          <el-button size="small" @click="drawer = false" class="normal-btn-width">{{$t(`取消`)}}</el-button>
+          <el-button size="small" type="primary" @click="onSubmit"  class="normal-btn-width btn-primary">{{$t(`确定`)}}</el-button>
+        </div>
       </div>
     </el-drawer>
   </div>