update:修改生产排产的问题

src/views/mes/pro/scheduleList/index.vue

@@ -9,10 +9,10 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="工序号" prop="processName">
+          <el-form-item label="工序名称" prop="processName">
             <el-input
               v-model="queryParams.processName"
-              placeholder="请输入工序号"
+              placeholder="请输入工序名称"
               clearable
               @keyup.enter.native="handleQuery"
             />
@@ -107,26 +107,32 @@
           >
         </template>
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         label="任务单名称"
         width="200"
         align="center"
         prop="taskName"
         :show-overflow-tooltip="true"
-      />
+      /> -->
       <el-table-column
-        label="工作站名称"
+        label="工作中心"
         align="center"
         prop="workstationName"
         width="180"
       />
       <el-table-column
+        label="作业单元名称"
+        align="center"
+        prop="workunitName"
+        width="180"
+      />
+      <!-- <el-table-column
         label="工艺名称"
         width="200"
         align="center"
         prop="routeName"
         show-overflow-tooltip
-      />
+      /> -->
       <el-table-column
         label="工序名称"
         align="center"
@@ -144,34 +150,34 @@
       <el-table-column label="单位" align="center" prop="unitOfMeasure" />
       <el-table-column label="排产数量" align="center" prop="quantity" />
       <el-table-column
-        label="开始生产时间"
+        label="计划开始时间"
         align="center"
-        prop="startTime"
+        prop="scheduleStartDate"
         width="180"
         :show-overflow-tooltip="true"
       >
         <template slot-scope="scope">
           <span>{{
-            parseTime(scope.row.startTime, "{y}-{m}-{d}:{h}-{m}-{s}")
+            parseTime(scope.row.scheduleStartDate, "{y}-{m}-{d}:{h}-{m}-{s}")
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         label="生产时长"
         align="center"
         prop="duration"
         width="120"
       >
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
-        label="完成生产时间"
+        label="计划结束时间"
         align="center"
-        prop="endTime"
+        prop="scheduleEndDate"
         width="180"
       >
         <template slot-scope="scope">
           <span>{{
-            parseTime(scope.row.endTime, "{y}-{m}-{d}:{h}-{m}-{s}")
+            parseTime(scope.row.scheduleEndDate, "{y}-{m}-{d}:{h}-{m}-{s}")
           }}</span>
         </template>
       </el-table-column>
@@ -220,26 +226,24 @@
       width="1000px"
       append-to-body
     >
-      <el-form ref="form" :model="form" label-width="80px">
+      <el-form ref="form" :model="form" label-width="120px">
         <el-row>
-          <el-col :lg="8" :md="8" :sm="12" :xs="12">
+          <el-col :span="12">
             <el-form-item label="编号" prop="taskCode">
               <el-input v-model="form.taskCode" readonly="readonly" disabled />
             </el-form-item>
           </el-col>
-          <el-col :lg="8" :md="8" :sm="12" :xs="12">
+          <!-- <el-col :span="12">
             <el-form-item label="名称" prop="taskName">
               <el-input v-model="form.taskName" readonly="readonly" disabled />
             </el-form-item>
-          </el-col>
-          <el-col :lg="8" :md="8" :sm="12" :xs="12">
+          </el-col> -->
+          <el-col :span="12">
             <el-form-item label="产品名称" prop="itemName">
               <el-input v-model="form.itemName" readonly="readonly" disabled />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :lg="8" :md="8" :sm="12" :xs="12">
+          <el-col :span="12">
             <el-form-item label="工序名称" prop="processName">
               <el-input
                 v-model="form.processName"
@@ -248,8 +252,8 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :lg="8" :md="8" :sm="12" :xs="12">
-            <el-form-item label="工作站" prop="workstationName">
+          <el-col :span="12">
+            <el-form-item label="工作中心" prop="workstationName">
               <el-input
                 v-model="form.workstationName"
                 readonly="readonly"
@@ -257,25 +261,22 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :lg="8" :md="8" :sm="12" :xs="12">
-            <el-form-item label="工作单元" prop="workunitId">
-              <el-input disabled v-model="form.workunitName"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :lg="8" :md="8" :sm="12" :xs="12">
-            <el-form-item label="排产数量" prop="quantity">
-              <el-input-number
-                :step="1"
-                :min="0"
+          <el-col :span="12">
+            <el-form-item label="作业单元名称" prop="workunitName">
+              <el-input
+                v-model="form.workunitName"
+                readonly="readonly"
                 disabled
-                v-model="form.quantity"
-                placeholder="请输入排产数量"
               />
             </el-form-item>
           </el-col>
-          <el-col :lg="8" :md="8" :sm="12" :xs="12">
+          <el-col :span="12">
+            <el-form-item label="工作单元" prop="workunitId">
+              <el-input disabled v-model="form.workunitName"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <!-- <el-col :span="12">
             <el-form-item label="生产时长" prop="duration">
               <el-input-number
                 :step="1"
@@ -285,7 +286,7 @@
                 placeholder="请输入生产时长"
               />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :lg="12" :md="12" :sm="12" :xs="12">
             <el-form-item label-width="130px" label="计划开始时间" prop="scheduleStartDate">
               <el-date-picker
@@ -310,7 +311,17 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-
+          <el-col :span="12">
+            <el-form-item label="排产数量" prop="quantity">
+              <el-input-number
+                :step="1"
+                :min="0"
+                disabled
+                v-model="form.quantity"
+                placeholder="请输入排产数量"
+              />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -318,7 +329,6 @@
               <el-input
                 v-model="form.remark"
                 type="textarea"
-                disabled
               />
             </el-form-item>
           </el-col>
@@ -500,8 +510,8 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          const {scheduleStartDate, scheduleEndDate, taskWorkunitId} = this.form
-          const params = {scheduleStartDate, scheduleEndDate, taskWorkunitId}
+          const {scheduleStartDate, scheduleEndDate, taskWorkunitId, remark} = this.form
+          const params = {scheduleStartDate, scheduleEndDate, taskWorkunitId, remark}
           updateList(params).then(response => {
             this.$modal.msgSuccess("修改成功");
             this.open = false;
@@ -531,6 +541,10 @@ export default {
       this.$modal
         .confirm('是否确认下达生产？')
         .then( ()=> {
+          if(!(this.ids&this.ids.length > 0)){
+            this.$modal.msgError("请至少选择一条数据")
+            return
+          }
           let formData = new FormData()
           this.ids.forEach(item => {
             formData.append('taskWorkunitIds', item)

src/views/mes/pro/scheduleList/orderList.vue

 <template>
     <div>
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="工单名称" prop="workorderName">
+      <!-- <el-form-item label="工单名称" prop="workorderName">
         <el-input
           v-model="queryParams.workorderName"
           placeholder="请输入工单名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="来源单据" prop="sourceCode">
         <el-input
           v-model="queryParams.sourceCode"
@@ -35,12 +35,13 @@
       </el-form-item>
       <el-form-item label="需求日期" prop="requestDate">
         <el-date-picker
-          clearable
           v-model="queryParams.requestDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择需求日期"
-        >
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          format="yyyy-MM-dd HH:mm:ss"
+          end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -219,7 +220,13 @@ export default {
     /** 查询物料编码列表 */
     getList() {
       this.loading = true;
-      listWorkorder(this.queryParams).then((response) => {
+      const params = {...this.queryParams}
+      if (params.requestDate&&params.requestDate.length > 0) {
+        params.requestDateFrom = params.requestDate[0]
+        params.requestDateTo = params.requestDate[1]
+      }
+      delete params.requestDate
+      listWorkorder(params).then((response) => {
         this.itemList = response.rows;
         this.total = response.total;
         this.loading = false;