Merge remote-tracking branch 'origin/dev' into dev

src/components/Form/ProductCostForm.vue

@@ -271,6 +271,46 @@
                       :value="operatoritem.value"></el-option>
                   </el-select>
                 </template>
+                <template v-if="formItems.attrType == 'date'">
+                  <template v-if="formItems.operator == '1' || formItems.operator == null">
+                    <el-date-picker v-model="formItems.min" type="date" value-format="yyyy-MM-dd "
+                      placeholder="选择日期" style="width: 170px;">
+                    </el-date-picker>
+                    <span>~</span>
+                    <el-date-picker v-model="formItems.max" type="date" value-format="yyyy-MM-dd "
+                      placeholder="选择日期" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '2'">
+                    <span>＜</span>
+                    <el-date-picker v-model="formItems.min" type="date" value-format="yyyy-MM-dd "
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '3'">
+                    <span>≤</span>
+                    <el-date-picker v-model="formItems.min" type="date" value-format="yyyy-MM-dd "
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '4'">
+                    <span>＞</span>
+                    <el-date-picker v-model="formItems.max" type="date" value-format="yyyy-MM-dd "
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '5'">
+                    <span>≥</span>
+                    <el-date-picker v-model="formItems.max" type="date" value-format="yyyy-MM-dd "
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <el-select v-model="formItems.operator" @change="selectoperatorChange($event, formItems.id)"
+                    placeholder="请选择" style="width: 120px;margin-left: 20px;">
+                    <el-option v-for="operatoritem in operator" :key="operatoritem.id" :label="operatoritem.label"
+                      :value="operatoritem.value"></el-option>
+                  </el-select>
+                </template>
 
                 <el-select v-if="formItems.attrType == 'select'" multiple v-model="formItems.list" placeholder="请选择"
                   style="width: 100%;" @change="selectChange($event, formItems.id, 'min')">
@@ -388,6 +428,46 @@
                       :value="operatoritem.value"></el-option>
                   </el-select>
                 </template>
+                <template v-if="formItems.attrType == 'date'">
+                  <template v-if="formItems.operator == '1' || formItems.operator == null">
+                    <el-date-picker v-model="formItems.min" type="date" value-format="yyyy-MM-dd "
+                      placeholder="选择日期" style="width: 170px;">
+                    </el-date-picker>
+                    <span>~</span>
+                    <el-date-picker v-model="formItems.max" type="date" value-format="yyyy-MM-dd "
+                      placeholder="选择日期" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '2'">
+                    <span>＜</span>
+                    <el-date-picker v-model="formItems.min" type="date" value-format="yyyy-MM-dd "
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '3'">
+                    <span>≤</span>
+                    <el-date-picker v-model="formItems.min" type="date" value-format="yyyy-MM-dd "
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '4'">
+                    <span>＞</span>
+                    <el-date-picker v-model="formItems.max" type="date" value-format="yyyy-MM-dd "
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '5'">
+                    <span>≥</span>
+                    <el-date-picker v-model="formItems.max" type="date" value-format="yyyy-MM-dd "
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <el-select v-model="formItems.operator" @change="selectoperatorChange($event, formItems.id)"
+                    placeholder="请选择" style="width: 120px;margin-left: 20px;">
+                    <el-option v-for="operatoritem in operator" :key="operatoritem.id" :label="operatoritem.label"
+                      :value="operatoritem.value"></el-option>
+                  </el-select>
+                </template>
                 <el-select v-if="formItems.attrType == 'select'" multiple v-model="formItems.list" placeholder="请选择"
                   style="width: 100%;" @change="selectChange($event, formItems.id, 'min')">
                   <el-option v-for="dict in formItems.dictLabal" :key="dict.code" :label="dict.name"
@@ -502,6 +582,46 @@
                       :value="operatoritem.value"></el-option>
                   </el-select>
                 </template>
+                <template v-if="formItems.attrType == 'date'">
+                  <template v-if="formItems.operator == '1' || formItems.operator == null">
+                    <el-date-picker v-model="formItems.min" type="date" value-format="yyyy-MM-dd "
+                      placeholder="选择日期" style="width: 170px;">
+                    </el-date-picker>
+                    <span>~</span>
+                    <el-date-picker v-model="formItems.max" type="date" value-format="yyyy-MM-dd "
+                      placeholder="选择日期" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '2'">
+                    <span>＜</span>
+                    <el-date-picker v-model="formItems.min" type="date" value-format="yyyy-MM-dd "
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '3'">
+                    <span>≤</span>
+                    <el-date-picker v-model="formItems.min" type="date" value-format="yyyy-MM-dd "
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '4'">
+                    <span>＞</span>
+                    <el-date-picker v-model="formItems.max" type="date" value-format="yyyy-MM-dd "
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '5'">
+                    <span>≥</span>
+                    <el-date-picker v-model="formItems.max" type="date" value-format="yyyy-MM-dd "
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <el-select v-model="formItems.operator" @change="selectoperatorChange($event, formItems.id)"
+                    placeholder="请选择" style="width: 120px;margin-left: 20px;">
+                    <el-option v-for="operatoritem in operator" :key="operatoritem.id" :label="operatoritem.label"
+                      :value="operatoritem.value"></el-option>
+                  </el-select>
+                </template>
                 <el-select v-if="formItems.attrType == 'select'" multiple v-model="formItems.list" placeholder="请选择"
                   style="width: 100%;" @change="selectChange($event, formItems.id, 'min')">
                   <el-option v-for="dict in formItems.dictLabal" :key="dict.code" :label="dict.name"