Merge remote-tracking branch 'origin/master'

hdy

2024-01-16 9562e6b8a5d1b703681074927efbd602b9f48108

 jcdm-ui/src/views/main/om/productionOrde/index.vue

@@ -21,7 +21,6 @@
        </el-select>
      </el-form-item>
      <el-form-item style="float: right">
        <el-button type="warning" icon="el-icon-download" size="mini" @click="getProductionNotice">接收</el-button>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button type="warning" icon="el-icon-copy-document" size="mini" @click="advancedQuery">高级查询</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -96,25 +95,34 @@
          v-hasPermi="['om:productionOrde:export']"
        >导出</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-upload2"
          :disabled="move"
          size="mini"
          @click="moveUp(val => val, 'up')"
        >上移</el-button>
      </el-col>
<!--      <el-col :span="1.5">-->
<!--        <el-button-->
<!--          type="warning"-->
<!--          plain-->
<!--          icon="el-icon-upload2"-->
<!--          :disabled="move"-->
<!--          size="mini"-->
<!--          @click="moveUp(val => val, 'up')"-->
<!--        >上移</el-button>-->
<!--      </el-col>-->
<!--      <el-col :span="1.5">-->
<!--        <el-button-->
<!--          type="warning"-->
<!--          plain-->
<!--          icon="el-icon-download"-->
<!--          size="mini"-->
<!--          :disabled="move"-->
<!--          @click="moveUp(val => val, 'down')"-->
<!--        >下移</el-button>-->
<!--      </el-col>-->
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          :disabled="move"
          @click="moveUp(val => val, 'down')"
        >下移</el-button>
          @click="getProductionNotice"
        >接收</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
@@ -146,25 +154,25 @@
        </el-table-column>
        <el-table-column label="需求数量" align="center" prop="planQty">
        </el-table-column>
        <el-table-column label="物料类型" width="140" align="center" prop="productCode">
        <el-table-column label="产品编号" width="150" align="center" prop="productCode">
        </el-table-column>
        <el-table-column label="实际数量" width="160" align="center" prop="actualQty">
        </el-table-column>
<!--        <el-table-column label="实际数量" width="160" align="center" prop="actualQty">-->
<!--        </el-table-column>-->
        <el-table-column label="工单状态" align="center" prop="orderStatus">
          <template slot-scope="scope">
            <dict-tag :options="dict.type.order_state" :value="scope.row.orderStatus"/>
          </template>
        </el-table-column>
        <el-table-column label="工厂" align="center" prop="workshopCode">
        </el-table-column>
        <el-table-column label="仓库" align="center">
        </el-table-column>
<!--        <el-table-column label="工厂" align="center" prop="workshopCode">-->
<!--        </el-table-column>-->
<!--        <el-table-column label="仓库" align="center">-->
<!--        </el-table-column>-->
        <el-table-column label="产线" align="center" prop="lineCode">
        </el-table-column>
        <el-table-column label="订单类型" align="center">
        </el-table-column>
        <el-table-column label="ZWS" align="center">
        </el-table-column>
<!--        <el-table-column label="订单类型" align="center">-->
<!--        </el-table-column>-->
<!--        <el-table-column label="ZWS" align="center">-->
<!--        </el-table-column>-->

<!--        <el-table-column label="工艺流程" width="140" align="center" prop="routeCode">-->
<!--        </el-table-column>-->
@@ -194,7 +202,7 @@
        </el-table-column>
        <el-table-column width="160" label="通知生成日期" align="center" prop="createTime">
        </el-table-column>
        <el-table-column label="成品描述" width="160" align="center" prop="productName">
        <el-table-column label="成品描述" width="320" align="center" prop="productName">
        </el-table-column>
<!--        <el-table-column label="修改人" width="80" align="center" prop="updateUser">-->
<!--        </el-table-column>-->
@@ -341,7 +349,7 @@
        <i class="el-icon-s-order"></i>
        {{titleName}}
      </span>
      <el-form ref="form" inline  :model="form"  :rules="CreateRules"label-width="80px">
      <el-form ref="form" inline  :model="form" :rules="CreateRules" label-width="80px">
        <el-form-item   label="种类" prop="typeZ">
          <el-input disabled v-model="form.typeZ"  placeholder="请输入种类" />
        </el-form-item>
@@ -353,12 +361,11 @@
                          placeholder="请选择日期" @input="handleCodeChange">
          </el-date-picker>
        </el-form-item>
        <el-form-item   label="日期规则" prop="dateTimeRule" hidden>
          <el-input  v-model="form.dateTimeRule"/>
        <el-form-item class="hidden-form-item" label="日期规则" prop="dateTimeRule">
          <el-input v-model="form.dateTimeRule"/>
        </el-form-item>

        <el-form-item   label="起始编号" prop="startCode">
          <el-input  v-model="form.startCode"  placeholder="请输入起始编号" @input="handleCodeChange"/>
          <el-input type="number"   :maxlength="3"  :pattern="'[0-9]{3}'" v-model="form.startCode"  placeholder="请输入起始编号" @input="handleCodeChange"/>
        </el-form-item>
        <el-form-item   label="起止编号" prop="startEndCode">
          <el-input disabled v-model="form.startEndCode"/>
@@ -388,6 +395,7 @@
  updateOrderScheduling,
  generateNumbers
} from "@/api/main/bs/orderScheduling/orderScheduling";
import {listMaterial} from "@/api/main/bs/material/material";

export default {
  name: "ProductionOrde",
@@ -452,6 +460,11 @@
        adds:null,
        productionNotice: null,
      },
      materialQueryParams: {
        pageNum: 1,
        pageSize: 10,
        materialCode: null,
      },

      // 表单参数
      form: {},
@@ -475,12 +488,19 @@
        year: [
          { required: true, message: "不能为空", trigger: "blur" }
        ],
        dateTime: [
          { required: true, message: "不能为空", trigger: "blur" }
        ],
        startCode: [
          { required: true, message: "不能为空", trigger: "blur" }
        ],
      },
      change: {
        day: '',
        month: '',
        year: '',
      },
      markNo: '',
    };
  },
  created() {
@@ -519,12 +539,12 @@
        }
        //日
        dateTimeRule = dateTimeRule + day;
        dateTimeRule = dateTimeRule + this.markNo;
        this.form.dateTimeRule = dateTimeRule;
        //赋值起始编码
        this.form.startEndCode = dateTimeRule + startCode + "----" + dateTimeRule + String(parseInt(startCode) + parseInt(planQty)-1).padStart(3, '0') ;
        this.form.startEndCode = dateTimeRule +  startCode + "----" + dateTimeRule + String(parseInt(startCode) + parseInt(planQty)-1).padStart(3, '0') ;
      }
    },


    getProductionNotice(){
      getProductionNotice(this.queryParams).then(response => {
@@ -704,14 +724,16 @@
      const id = Row.id || this.ids
      getProductionOrde(id).then(response => {
        console.log(response.data)
        console.log(response.data.productCode)
        this.materialQueryParams.materialCode = response.data.productCode;
        listMaterial(this.materialQueryParams).then(response => {
          this.markNo = response.rows[0].mark
        });
        this.form = response.data;
        this.Createopen = true;
        this.titleName = "生成箱体条码";
        // return Array.from({ length: parseInt(this.actualQty) }, (_, index) => index + 1);
      });
      this.$modal.msgSuccess(Row.actualQty);


    },
    /** 修改按钮操作 */
    handleUpdate(row) {
@@ -753,7 +775,7 @@
          if (this.form.id != null) {
            addOrderSchedulingForBoxCode(this.form).then(response => {
              this.$modal.msgSuccess("保存成功");
              this.open = false;
              this.Createopen = false;
              this.getList();
            });
          }
@@ -782,8 +804,7 @@
};
</script>
<style lang="scss" scoped>
//::v-deep .el-dialog__header{
//  /*background-color: #f8f8f8;*/
//  background-color: #f8f8f9;
//}
.hidden-form-item {
  display: none;
}
</style>