Merge remote-tracking branch 'origin/master'

zss

2024-01-11 17f0e644be8c98b547f6994a7e827d328e7b532e

 src/views/plan/productionschedul/index.vue

@@ -10,37 +10,37 @@
                <div>
                  <el-button @click="tagFinished" size="mini" round type="success">标记已完成</el-button>
                  <el-button size="mini" round type="primary"
                  v-if="permissions.plan_productionschedul_edit_line" 
                  v-if="permissions.plan_productionschedul_edit_line"
                  @click="openEditDialog">编辑时间线</el-button>
                  <el-tooltip content="刷新">
                    <el-button circle icon="el-icon-refresh" @click="getDataList"></el-button>
                  </el-tooltip>
                </div>
              </div>
              <avue-crud 
              <avue-crud
              class="unfinished-crud"
              :data="tableData" 
              ref="crud" 
              :option="option" 
              :span-method="spanMethod" 
              :data="tableData"
              ref="crud"
              :option="option"
              :span-method="spanMethod"
              @refresh-change="getDataList"
              @current-change="handleCurrentChange"
              @size-change="handleSizeChange"
              :page="page" 
              :page="page"
              @selection-change="selectionRow"
              :table-loading="loading">
              <template #menu="{ row, index }">
                <el-button 
                v-if="permissions.plan_productionschedul_edit" 
                type="text" 
                icon="el-icon-edit" 
                size="small" 
                <el-button
                v-if="permissions.plan_productionschedul_edit"
                type="text"
                icon="el-icon-edit"
                size="small"
                @click="editHandle(row, index)">编辑</el-button>
                <el-button 
                v-if="permissions.plan_productionschedul_del" 
                type="text" 
                icon="el-icon-delete" 
                size="small" 
                <el-button
                v-if="permissions.plan_productionschedul_del"
                type="text"
                icon="el-icon-delete"
                size="small"
                @click="deleteHandle(row, index)">删除</el-button>
              </template>
              </avue-crud>
@@ -51,23 +51,23 @@
              <div style="display:flex;height:36px;justify-content: space-between;align-items:center;">
                <div><span style="color:#34BD66;font-weight: bold;">已完成</span></div>
              </div>
              <avue-crud 
              <avue-crud
              class="finished-crud"
              :data="finishedTableData" 
              ref="finished" 
              :option="finishedOption" 
              :span-method="spanMethod" 
              :data="finishedTableData"
              ref="finished"
              :option="finishedOption"
              :span-method="spanMethod"
              @refresh-change="getFinishedData"
              @current-change="handleCurrentChange"
              @size-change="handleSizeChange"
              :page="finishedPage" 
              :page="finishedPage"
              @selection-change="selectionFinishedRow">
              <!-- <template #menu="{ row, index }">
                <el-button 
                v-if="permissions.plan_productionschedul_del" 
                type="text" 
                icon="el-icon-delete" 
                size="small" 
                <el-button
                v-if="permissions.plan_productionschedul_del"
                type="text"
                icon="el-icon-delete"
                size="small"
                @click="deleteHandle(row, index)">删除</el-button>
              </template> -->
              </avue-crud>
@@ -129,7 +129,7 @@
                      style="width:100%"
                      v-model="item.planTime"
                      value-format="yyyy-MM-dd HH:mm:ss"
                      type="datetime" 
                      type="datetime"
                      placeholder="选择日期时间">
                    </el-date-picker>
                  </el-col>
@@ -143,7 +143,7 @@
                      style="width:100%"
                      v-model="item.actualTime"
                      value-format="yyyy-MM-dd HH:mm:ss"
                      type="datetime" 
                      type="datetime"
                      placeholder="选择日期时间">
                    </el-date-picker>
                  </el-col>
@@ -454,7 +454,7 @@
      }, {
        prop: 'contractNo',
        span: []
      }, 
      },
      {
        prop: 'orderTime',
        span: []