zss
2024-01-30 06367391d2f853a302266a1dfba8da5e813f8761
Merge remote-tracking branch 'origin/master'
已修改3个文件
38 ■■■■ 文件已修改
src/views/plan/productionschedul/index.vue 33 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/quality/Packaging_ledger/index.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/quality/finishedProductInspection/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/plan/productionschedul/index.vue
@@ -62,14 +62,6 @@
              @size-change="handleSizeChange"
              :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"
                @click="deleteHandle(row, index)">删除</el-button>
              </template> -->
              </avue-crud>
            </el-col>
          </el-row>
@@ -110,8 +102,7 @@
    title="编辑时间线"
    :visible.sync="dialogVisible"
    top="5vh"
    width="50%"
    :before-close="handleClose">
    width="50%">
      <div style="height:60vh;overflow-y: scroll;">
        <el-timeline>
          <el-timeline-item
@@ -130,7 +121,7 @@
                      v-model="item.planTime"
                      value-format="yyyy-MM-dd HH:mm:ss"
                      type="datetime"
                      placeholder="选择日期时间">
                      placeholder="选择计划时间">
                    </el-date-picker>
                  </el-col>
                </el-row>
@@ -144,7 +135,7 @@
                      v-model="item.actualTime"
                      value-format="yyyy-MM-dd HH:mm:ss"
                      type="datetime"
                      placeholder="选择日期时间">
                      placeholder="选择实际时间">
                    </el-date-picker>
                  </el-col>
                </el-row>
@@ -594,12 +585,6 @@
        "productActualTime": data[5].actualTime,
        "productPlanTime": data[5].planTime,
        "mids": mIds,
        // "contractNo": orderObj.contractNo,
        // "customerName": orderObj.customerName,
        // "deliveryDate": orderObj.deliveryDate,
        // "orderTime": orderObj.orderTime,
        // "productType": orderObj.productType,
        // "projectName": orderObj.projectName
      }
      fillTime(obj).then(res=>{
        if(res.status===200){
@@ -613,9 +598,6 @@
        console.error(error);
      })
    },
    handleClose(done){
      done()
    },
    initTimeLine(data){
      let scheduleList = []
@@ -666,15 +648,8 @@
      }
    },
    selectionRow(val){
      if (val.length > 1) {
        const preVal = val.shift();
        this.$refs.crud.toggleRowSelection(preVal, false);
      }
      else{
        this.scheduleList=[]
      }
      this.multipleSelection = val
      this.getScheduleById(val[0].mid)
      this.getScheduleById(val[val.length-1].mid)
    },
    selectionFinishedRow(val){
      if (val.length > 1) {
src/views/quality/Packaging_ledger/index.vue
@@ -565,7 +565,4 @@
    font-size: 12pt;
    font-family: 宋体;
}
.avue-main .el-card__body {
    padding: 4px 0px 5px;
}
</style>
src/views/quality/finishedProductInspection/index.vue
@@ -169,7 +169,7 @@
                    {
                        minWidth: '120',
                        prop: 'createTime',
                        label: '检验日期',
                        label: '报检日期',
                        sort: true,
                        isTrue: true,
                        isSearch: true,