opt:优化界面操作

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/InStorageTask.java

@@ -43,8 +43,8 @@ public class InStorageTask extends AbstractTask {
 
     @Override
     public JSONObject createTask(JSONObject from) {
-        String vehicle_code = "Z00004035";
-        String struct_code = "L01-22-33";
+        String vehicle_code = from.getString("vehicle_code");
+        String struct_code = from.getJSONObject("form_data").getString("end_struct_code");
         String start_point = from.getString("start_point");
         String task_type = from.getString("task_type");
         if (StringUtils.isEmpty(vehicle_code) ||StringUtils.isEmpty(start_point)||StringUtils.isEmpty(struct_code)){

wms_pro/qd/src/views/wms/pm_manage/feedback_data/index.vue

@@ -224,7 +224,7 @@
         <el-table-column prop="source_form_id" label="源单编码" show-overflow-tooltip width="120" />
         <el-table-column prop="proc_inst_id" label="对应流程实例id" show-overflow-tooltip width="120" />
         <el-table-column
-          v-permission="['admin','Classstandard:edit','Classstandard:del']"
+          v-permission="['admin','Classstandard:edit']"
           label="操作"
           width="120px"
           align="center"

wms_pro/qd/src/views/wms/stor_manage/in/index.vue

@@ -291,6 +291,7 @@ export default {
   },
   methods: {
     [CRUD.HOOK.beforeRefresh]() {
+      this.setDefaultDate()
       formstruc.getHeader('st_ivt_iostorinv_out').then(res => {
         this.cols = res
       })
@@ -331,6 +332,21 @@ export default {
         this.crud.toQuery()
       })
     },
+    setDefaultDate() {
+      const now = new Date()
+      const lastWeek = new Date()
+      lastWeek.setDate(now.getDate() - 3)
+      const format = (date, time) => {
+        const yyyy = date.getFullYear()
+        const mm = String(date.getMonth() + 1).padStart(2, '0')
+        const dd = String(date.getDate()).padStart(2, '0')
+        return `${yyyy}-${mm}-${dd} ${time}`
+      }
+      const start_time = format(lastWeek, '00:00:00')
+      const end_time = format(now, '23:59:59')
+      this.query.start_time = start_time
+      this.query.end_time = end_time
+    },
     handleCurrentChange(currentRow) {
       if (currentRow === null) {
         this.dis_flag = true

wms_pro/qd/src/views/wms/stor_manage/out/AddDialog.vue

@@ -25,11 +25,13 @@
       <el-form-item label="单据号" prop="code">
         <el-input v-model="form.code" disabled placeholder="系统生成" clearable style="width: 150px" />
       </el-form-item>
+      <el-form-item label="单据状态" prop="status">
+        <el-input v-model="form.status" disabled placeholder="生成" clearable style="width: 150px" />
+      </el-form-item>
       <el-form-item label="业务类型" prop="status">
         <el-select
           v-model="form.bill_type"
           clearable
-          style="width: 100px; height: 35px;top: -5px;"
           placeholder="业务类型"
         >
           <el-option
@@ -40,21 +42,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="单据状态" prop="status">
-        <el-input v-model="form.status" disabled placeholder="生成" clearable style="width: 150px" />
-      </el-form-item>
-      <el-form-item label="源单类型" prop="source_form_type">
-        <el-input v-model="form.source_form_type" clearable style="width: 150px" />
-      </el-form-item>
-      <el-form-item label="源单编码" prop="source_form_id">
-        <el-input v-model="form.source_form_code" clearable style="width: 150px" />
-      </el-form-item>
-      <el-form-item label="源单id" prop="source_form_id">
-        <el-input v-model="form.source_form_id" clearable style="width: 150px" />
-      </el-form-item>
-      <el-form-item label="源单时间" prop="source_form_date">
-        <el-input v-model="form.source_form_date" clearable style="width: 150px" />
-      </el-form-item>
       <el-select
         v-model="form.stor_code"
         clearable
@@ -71,6 +58,7 @@
           :value="item.value"
         />
       </el-select>
+
       <template v-for="(col,index) in cols">
         <el-form-item label="col.lable" prop="bill_code">
           <label slot="label">{{ col.lable }}:</label>
@@ -94,6 +82,18 @@
           <el-input v-if="col.value != 'product_area'" v-model="form.form_data[col.value]" :value="col.value" clearable style="width: 150px" />
         </el-form-item>
       </template>
+      <el-form-item label="源单类型" prop="source_form_type">
+        <el-input v-model="form.source_form_type" clearable style="width: 150px" />
+      </el-form-item>
+      <el-form-item label="源单编码" prop="source_form_id">
+        <el-input v-model="form.source_form_code" clearable style="width: 150px" />
+      </el-form-item>
+      <el-form-item label="源单id" prop="source_form_id">
+        <el-input v-model="form.source_form_id" clearable style="width: 150px" />
+      </el-form-item>
+      <el-form-item label="源单时间" prop="source_form_date">
+        <el-input v-model="form.source_form_date" clearable style="width: 150px" />
+      </el-form-item>
       <el-form-item label="备注" prop="remark">
         <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
         <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" />
@@ -163,7 +163,7 @@
           </el-select>
         </template>
       </el-table-column>
-      <el-table-column show-overflow-tooltip prop="struct_code" label="分配仓位" />
+
       <el-table-column show-overflow-tooltip prop="stor_code" label="仓库" width="160" align="center">
         <template scope="scope">
           <el-select
@@ -182,21 +182,6 @@
           </el-select>
         </template>
       </el-table-column>
-      <el-table-column show-overflow-tooltip prop="source_form_type" label="源单类型" width="190" align="center">
-        <template scope="scope">
-          <el-input v-model="tableData[scope.$index].source_form_type" class="input-with-select" />
-        </template>
-      </el-table-column>
-      <el-table-column show-overflow-tooltip prop="source_form_code" label="源单编码" width="190" align="center">
-        <template scope="scope">
-          <el-input v-model="tableData[scope.$index].source_form_code" class="input-with-select" />
-        </template>
-      </el-table-column>
-      <el-table-column show-overflow-tooltip prop="source_form_type" label="源单id" width="190" align="center">
-        <template scope="scope">
-          <el-input v-model="tableData[scope.$index].source_form_id" class="input-with-select" />
-        </template>
-      </el-table-column>
       <el-table-column v-for="(item, index) in dtlCols" :key="item.value" :label="item.lable" width="160">
         <template scope="scope">
           <el-select
@@ -218,7 +203,23 @@
           <el-input v-if="item.value != 'product_area'" v-model="tableData[scope.$index].form_data[item.value]" disabled class="input-with-select" />
         </template>
       </el-table-column>
+      <el-table-column show-overflow-tooltip prop="struct_code" label="分配仓位" />
 
+      <el-table-column show-overflow-tooltip prop="source_form_type" label="源单类型" width="190" align="center">
+        <template scope="scope">
+          <el-input v-model="tableData[scope.$index].source_form_type" class="input-with-select" />
+        </template>
+      </el-table-column>
+      <el-table-column show-overflow-tooltip prop="source_form_code" label="源单编码" width="190" align="center">
+        <template scope="scope">
+          <el-input v-model="tableData[scope.$index].source_form_code" class="input-with-select" />
+        </template>
+      </el-table-column>
+      <el-table-column show-overflow-tooltip prop="source_form_type" label="源单id" width="190" align="center">
+        <template scope="scope">
+          <el-input v-model="tableData[scope.$index].source_form_id" class="input-with-select" />
+        </template>
+      </el-table-column>
       <el-form-item label="备注" prop="remark">
         <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
         <template scope="scope">
@@ -300,6 +301,7 @@ export default {
       tableData: [],
       dialogVisible: false,
       materShow: false,
+      unit_id: 'MX005',
       id: '',
       formShow: false,
       dtlShow: false,
@@ -322,6 +324,7 @@ export default {
     }
   },
   methods: {
+
     setForm(row) {
       this.id = row.form.id
     },

wms_pro/qd/src/views/wms/stor_manage/out/ViewDialog.vue

@@ -87,18 +87,19 @@
         @current-change="handleDtlCurrentChange"
       >
         <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column show-overflow-tooltip prop="source_form_type" label="源单类型" align="center" />
+        <el-table-column prop="source_form_id" label="源单ID" width="180" />
+        <el-table-column prop="billCode" label="源单编号" width="160" />
+        <el-table-column show-overflow-tooltip prop="source_form_data" label="源单数据" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
         <el-table-column prop="pcsn" label="批次" width="150" align="center" />
         <el-table-column prop="qty" :formatter="crud.formatNum3" label="计划数量" align="center" />
-        <el-table-column prop="unit_id" label="单位" align="center" />
+        <!--        <el-table-column prop="unit_id" label="单位" align="center" />-->
         <el-table-column prop="vehicle_code" label="载具" align="center" />
         <el-table-column prop="stor_code" label="仓库编号" align="center" />
         <el-table-column prop="struct_code" label="分配仓位" align="center" />
-        <el-table-column show-overflow-tooltip prop="source_form_type" label="源单类型" align="center" />
-        <el-table-column show-overflow-tooltip prop="source_form_id" label="源单号" align="center" />
-        <el-table-column show-overflow-tooltip prop="source_form_data" label="源单数据" align="center" />
         <el-table-column v-for="(item, index) in dtlCols" :key="item.value" show-overflow-tooltip width="150" :label="item.lable">
           <template slot-scope="scope">{{ scope.row.form_data[item.value] }}</template>
         </el-table-column>

wms_pro/qd/src/views/wms/stor_manage/out/index.vue

@@ -278,7 +278,23 @@ export default {
     this.$set(this.query, 'form_query', {})
   },
   methods: {
+    setDefaultDate() {
+      const now = new Date()
+      const lastWeek = new Date()
+      lastWeek.setDate(now.getDate() - 3)
+      const format = (date, time) => {
+        const yyyy = date.getFullYear()
+        const mm = String(date.getMonth() + 1).padStart(2, '0')
+        const dd = String(date.getDate()).padStart(2, '0')
+        return `${yyyy}-${mm}-${dd} ${time}`
+      }
+      const start_time = format(lastWeek, '00:00:00')
+      const end_time = format(now, '23:59:59')
+      this.query.start_time = start_time
+      this.query.end_time = end_time
+    },
     [CRUD.HOOK.beforeRefresh]() {
+      this.setDefaultDate()
       formstruc.getHeader('st_ivt_iostorinv_out').then(res => {
         this.cols = res
       })