518合并代码

src/xt_pages/stock/stockQuery.vue

@@ -37,32 +37,35 @@
               :value="item.id">
             </el-option>
           </el-select> -->
-          <!-- <el-date-picker
+          <el-date-picker
             size="small"
             v-model="start_time"
             prefix-icon="el-icon-date"
             :editable="false"
-            style="width: 196px;"
+            style="width: 150px;"
             type="date"
             placeholder="选择日期时间"
             align="right"
             format="yyyy-MM-dd"
             value-format="yyyy-MM-dd"
             @change="startTimeChange"
-           ></el-date-picker>-
+            v-if="org_id == 3907 || org_id == 9671"
+           ></el-date-picker> 
+            <span v-if="org_id == 3907 || org_id == 9671">-</span> 
             <el-date-picker
               size="small"
               v-model="end_time"
               prefix-icon="el-icon-date"
               :editable="false"
-              style="width: 196px;"
+              style="width: 150px;"
               type="date"
               placeholder="选择日期时间"
               align="right"
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
               @change="endTimeChange"
-          ></el-date-picker> -->
+              v-if="org_id == 3907 || org_id == 9671"
+          ></el-date-picker>
           <!-- <el-input
             size="small"
             style="width: 200px;margin-left:10px;"