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

gaoluyang

4 天以前 0a5df5ab2cc2f564ccebb54ec28e0a0b159797bf

 src/views/productionManagement/operationScheduling/index.vue

@@ -2,22 +2,14 @@
   <div class="app-container">
      <div class="search_form">
         <el-form :model="searchForm" :inline="true">
            <el-form-item label="客户名称:">
               <el-input v-model="searchForm.customerName" placeholder="请输入" clearable prefix-icon="Search"
                              @change="handleQuery" />
            </el-form-item>
            <el-form-item label="项目名称:">
               <el-input v-model="searchForm.projectName" placeholder="请输入" clearable prefix-icon="Search"
                              @change="handleQuery" />
            </el-form-item>
            <el-form-item label="派工日期:">
               <el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
                                       placeholder="请选择" clearable @change="changeDaterange" />
            </el-form-item>
            <el-form-item label="状态:">
               <el-select v-model="searchForm.status" placeholder="请选择状态" style="width: 140px" clearable>
               <el-select v-model="searchForm.status" placeholder="请选择状态" @change="handleQuery" style="width: 140px" clearable>
                  <el-option label="待排产" :value="1"></el-option>
                  <el-option label="已排产" :value="0"></el-option>
                  <el-option label="已排产" :value="3"></el-option>
                  <el-option label="排产中" :value="2"></el-option>
               </el-select>
            </el-form-item>
@@ -73,7 +65,7 @@
      prop: "status",
      dataType: "tag",
      formatData: (params) => {
         if (params == 0) {
         if (params == 3) {
            return "已排产";
         } else if (params == 1) {
            return "待排产";
@@ -82,7 +74,7 @@
         }
      },
      formatType: (params) => {
         if (params == 0) {
         if (params == 3) {
            return "success";
         } else if (params == 1) {
            return "primary";
@@ -99,26 +91,6 @@
   {
      label: "派工人",
      prop: "schedulingUserName",
   },
   {
      label: "合同号",
      prop: "salesContractNo",
      width: 200,
   },
   {
      label: "客户合同号",
      prop: "customerContractNo",
      width: 200,
   },
   {
      label: "客户名称",
      prop: "customerName",
      width: 200,
   },
   {
      label: "项目名称",
      prop: "projectName",
      width:300
   },
   {
      label: "产品大类",
@@ -220,6 +192,12 @@
const handleDelete = () => {
   let ids = [];
   if (selectedRows.value.length > 0) {
      // 新增：判断是否有已排产的数据
      const hasScheduled = selectedRows.value.some(item => item.status == 3);
      if (hasScheduled) {
         proxy.$modal.msgWarning("已排产数据不能取消排产");
         return;
      }
      ids = selectedRows.value.map((item) => item.id);
   } else {
      proxy.$modal.msgWarning("请选择数据");