切换分支备份

src/views/inventory/supInoutSearchOrder.vue

@@ -1,7 +1,8 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" size="mini" label-width="100px">
+      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form"
+               size="mini" label-width="100px">
         <!-- <el-row>
            <el-col :span="18">
              <el-form-item label="扫码查询:">
@@ -143,7 +144,8 @@
          </el-row> -->
         <el-row style=" display:flex;  flex-wrap: wrap; ">
           <template v-for="(item, index) in queryList">
-            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`" :key="item.id">
               <el-input
                 v-model="filterQuery[item.columnName]"
                 :placeholder="item.columnDesc"
@@ -152,7 +154,8 @@
                 clearable
               ></el-input>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-select v-model="filterQuery[item.columnName]"
                          :placeholder="item.columnDesc"
                          :disabled="executeEval(null,item.disabledFuc,false)"
@@ -164,12 +167,15 @@
                   :value="dict.value"
                 />
                 <span style="float: left">{{ item.name }}</span>
-                <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{
+                    item.code
+                  }}</span>
               </el-select>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-select
-                v-model="map[item.columnName]"
+                v-model="filterQuery[item.columnName]"
                 :placeholder="item.columnDesc"
                 :disabled="executeEval(null,item.disabledFuc,false)"
                 filterable
@@ -183,10 +189,13 @@
                   :value="item.code"
                 />
                 <span style="float: left">{{ item.name }}</span>
-                <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                <span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{
+                    item.code
+                  }}</span>
               </el-select>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-date-picker
                 :picker-options="pickerOptions"
                 v-model="actDateRange"
@@ -199,7 +208,8 @@
               ></el-date-picker>
             </el-form-item>
 
-            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-date-picker
                 v-model="filterQuery[item.columnName]"
                 :style="`width:${item.width+'px'}`"
@@ -209,7 +219,8 @@
                 :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'datePickera' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'datePickera' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-date-picker
                 :picker-options="pickerOptions"
                 v-model="confirmDateRange"
@@ -237,10 +248,16 @@
           >查询
           </el-button
           >
-          <el-button type="primary" icon="el-icon-document" @click="selectExport" :loading="selectExportLoading">选中导出Excel</el-button>
+          <el-button type="primary" icon="el-icon-document" @click="selectExport" :loading="selectExportLoading">
-          <el-button type="primary" icon="el-icon-document" @click="searchExport" :loading="searchExportLoading">结果导出Excel</el-button>
+            选中导出Excel
-          <el-button type="primary" icon="el-icon-printer" @click="optinPrint" :loading="optinPrintLoading">选中打印</el-button>
+          </el-button>
-          <el-button type="primary" icon="el-icon-printer" @click="selectPrint" :loading="selectPrinttLoading">查询结果打印</el-button>
+          <el-button type="primary" icon="el-icon-document" @click="searchExport" :loading="searchExportLoading">
+            结果导出Excel
+          </el-button>
+          <el-button type="primary" icon="el-icon-printer" @click="optinPrint" :loading="optinPrintLoading">选中打印
+          </el-button>
+          <el-button type="primary" icon="el-icon-printer" @click="selectPrint" :loading="selectPrinttLoading">查询结果打印
+          </el-button>
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>
@@ -324,7 +341,9 @@
             :key="item.columnName"
           >
             <template slot-scope="scope">
-              <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
+              <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
+                  item.lableRuleObj[scope.row[item.columnName]]
+                }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -337,8 +356,11 @@
             :key="item.columnName"
           >
             <template slot-scope="scope">
-              <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+              <el-tag
-                <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+                :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                <span>{{
+                    item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
+                  }}</span>
               </el-tag>
             </template>
           </el-table-column>
@@ -373,7 +395,9 @@
             :key="item.columnName"
           >
             <template slot-scope="scope">
-              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
+                  scope.row[item.columnName]
+                }}</span>
             </template>
           </el-table-column>
         </template>