rev：12-19优化项

wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue

@@ -29,13 +29,21 @@
             />
           </el-form-item>
           <el-form-item label="机台编码">
-            <el-input
+            <el-select
               v-model="query.device_code"
               clearable
               size="mini"
-              placeholder="机台编码"
-              @keyup.enter.native="crud.toQuery"
-            />
+              placeholder="全部"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in deviceList"
+                :key="item.device_code"
+                :label="item.device_name"
+                :value="item.device_code"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="工单状态">
             <el-select
@@ -71,6 +79,17 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="创建时间" prop="createTime">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
           <rrOperation />
         </el-form>
       </div>
@@ -339,12 +358,41 @@ export default {
     crudDeviceinfo.getDevice({}).then(res => {
       this.deviceList = res
     })
+    this.initQuery()
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
+    /* 搜索框创建时间默认最近一周*/
+    initQuery() {
+      const end = new Date()
+      const start = new Date()
+      const endYear = end.getFullYear()
+      var endMonth = end.getMonth() + 1
+      if (end.getMonth() + 1 < 10) {
+        endMonth = '0' + endMonth.toString()
+      }
+      var endDay = end.getDate()
+      if (end.getDate() < 10) {
+        endDay = '0' + endDay.toString()
+      }
+      const endDate = endYear + '-' + endMonth + '-' + endDay + ' 23:59:59'
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+      const startYear = start.getFullYear()
+      var startMonth = start.getMonth() + 1
+      if (start.getMonth() + 1 < 10) {
+        startMonth = '0' + startMonth.toString()
+      }
+      var startDay = start.getDate()
+      if (start.getDate() < 10) {
+        startDay = '0' + startDay.toString()
+      }
+      const startDate = startYear + '-' + startMonth + '-' + startDay + ' 00:00:00'
+      this.$set(this.query, 'createTime', [startDate, endDate])
+      this.crud.toQuery()
+    },
     queryMater(value) {
       crudGroup.queryMater({ 'material_code': value }).then(row => {
         this.form.material_spec = row.material_spec

wms/nladmin-ui/src/views/wms/st/combinedBox/index.vue

@@ -107,7 +107,23 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="物料编码" prop="material_code">
-                <el-input v-model="form.material_code" style="width: 200px;" @change="queryMater" />
+                <el-select
+                  v-model="form.material_code"
+                  size="mini"
+                  placeholder="全部"
+                  style="width: 200px"
+                  class="filter-item"
+                  filterable
+                  :disabled="crud.status.edit > 0"
+                  @change="queryMater"
+                >
+                  <el-option
+                    v-for="item in materList"
+                    :key="item.material_code"
+                    :label="item.material_name"
+                    :value="item.material_code"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
 
@@ -261,6 +277,7 @@ export default {
       openWeighDialog: false,
       loadingSendTask: false,
       openParamWeigh: null,
+      materList: [],
       rules: {
         material_code: [
           { required: true, message: '物料编码不能为空', trigger: 'blur' }
@@ -275,6 +292,9 @@ export default {
     }
   },
   created() {
+    crudGroup.queryMaterList({}).then(res => {
+      this.materList = res
+    })
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据

wms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue

@@ -197,7 +197,7 @@ const defaultForm = {
   bill_status: '10',
   total_qty: '0',
   detail_count: '0',
-  bill_type: '',
+  bill_type: '1001',
   remark: '',
   biz_date: new Date(),
   out_stor_id: '',

wms/nladmin-ui/src/views/wms/st/piecebox/AddDialog.vue

@@ -45,7 +45,23 @@
         </el-select>
       </el-form-item>
       <el-form-item label="物料编码" prop="material_code">
-        <el-input v-model="form.material_code" :disabled="crud.status.view > 0" style="width: 200px;" @change="queryMater" />
+        <el-select
+          v-model="form.material_code"
+          size="mini"
+          placeholder="全部"
+          style="width: 200px"
+          class="filter-item"
+          filterable
+          :disabled="crud.status.view > 0"
+          @change="queryMater"
+        >
+          <el-option
+            v-for="item in materList"
+            :key="item.material_code"
+            :label="item.material_name"
+            :value="item.material_code"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="物料名称" prop="material_name">
         <el-input v-model="form.material_name" disabled style="width: 200px;" />
@@ -184,6 +200,7 @@ export default {
     return {
       dialogVisible: false,
       taskStatusList: [],
+      materList: [],
       storId: null,
       materialCode: null,
       structShow: false,
@@ -233,6 +250,9 @@ export default {
       crudStorattr.getStor({}).then(res => {
         this.storlist = res
       })
+      crudGroup.queryMaterList({}).then(res => {
+        this.materList = res
+      })
       this.getTaskStatusList()
     },
     getTaskStatusList() {

wms/nladmin-ui/src/views/wms/statement/structivt/image.vue

@@ -2,7 +2,7 @@
   <div class="image-modal" v-if="visible" @click.self="close">
     <div class="demo-image">
       <el-image
-        style="width: 500px; height: 500px"
+        style="width: 1000px; height: 600px"
         :src="imageUrl"
       ></el-image>
     </div>

wms/nladmin-ui/src/views/wms/statement/structivt/index.vue

@@ -52,6 +52,17 @@
               class="filter-item"
             />
           </el-form-item>
+          <el-form-item label="生产时间" prop="createTime">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
           <rrOperation :crud="crud" />
         </el-form>
       </div>
@@ -88,7 +99,7 @@
         <el-table-column prop="pcsn" label="批次号" :min-width="flexWidth('pcsn',crud.data,'批次号')" />
         <el-table-column prop="storagevehicle_code" label="载具号">
           <template slot-scope="scope">
-            <el-link type="warning" @click="toView(scope.row.vehicle_code)">{{ scope.row.storagevehicle_code }}</el-link>
+            <el-link type="warning" @click="toView(scope.row.storagevehicle_code)">{{ scope.row.storagevehicle_code }}</el-link>
           </template>
         </el-table-column>
         <el-table-column prop="canuse_qty" label="可用数" :formatter="crud.formatNum3" :min-width="100" />