da

jiangping

2023-08-22 cf47d288de5e1423e86386f1c7c452353b4e8a0a

da

 platform_web/src/views/business/clientManger.vue

@@ -52,7 +52,6 @@
          </template>
        </el-table-column>
        <el-table-column prop="phone" label="主账号" align="center" min-width="100px"></el-table-column>
        <el-table-column prop="phone" label="人数限制" align="center" min-width="100px"></el-table-column>
        <el-table-column prop="linkName" label="联系人" align="center" min-width="100px"></el-table-column>
        <el-table-column prop="linkPhone" label="联系电话" align="center" min-width="120px"></el-table-column>
        <el-table-column prop="oepnValidDate" label="有效期" align="center" min-width="140px"></el-table-column>

 server/src/main/java/doumeemes/biz/system/impl/SystemUserBizImpl.java

@@ -325,10 +325,12 @@
        cu.setDeleted(Constants.ZERO);
        cu.setCreateTime(date);
        cu.setCode("NO."+userParam.getPhone());
        cu.setIsMaster(com.getIsNew());//是否主账号
        cu.setPhoneAuthStatus(Constants.ZERO+"");
        cu.setQrcodeid(barcodeParamExtService.getByType(com.getId(),com.getRootDepartment().getId(),Constants.BARCODEPARAM_TYPE.user)+"");
        cu.setComDepartId(com.getRootDepartment().getId());
        cu.setDepartmentId(com.getRootDepartment().getId());
        cu.setOrigin(userParam.getOrigin());
        if(userParam.getOrigin() == Constants.COMPANY_ORIGIN.lingyang){
            cu.setLingyangUserid(userParam.getUserId());
        }else if(userParam.getOrigin() == Constants.COMPANY_ORIGIN.edgp){
@@ -463,7 +465,6 @@
        if(srList!=null && srList.size()>0){
            List<SystemUserRole> urList = new ArrayList<>();
            for(SystemRole tr :srList){

                SystemUserRole userRole = new SystemUserRole();
                userRole.setUserId(cu.getUserId());
                userRole.setDeleted(false);
@@ -473,7 +474,7 @@
                userRole.setCreateTime(userRole.getInvalidTime());
                userRole.setRemark("羚羊企业生成自动导入");
                urList.add(userRole);
//                    systemUserRoleMapper.insert(userRole);
//              systemUserRoleMapper.insert(userRole);
            }
            systemRoleMapper.insertRoleUserBatch(urList);
        }

 server/src/main/java/doumeemes/dao/business/dto/statistics/ProcedurePlansPageModel.java

@@ -30,6 +30,8 @@
    private BigDecimal  unqualifiedRate;
    @ApiModelProperty(value = "物料编码")
    private String materialCode;
    @ApiModelProperty(value = "物料名称")
    private String materialName;
    @ApiModelProperty(value = "工序名称")
    private String procedureName;


 server/src/main/java/doumeemes/dao/business/dto/statistics/Unqualified7DayModel.java

@@ -1,5 +1,6 @@
package doumeemes.dao.business.dto.statistics;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,5 +18,6 @@
    @ApiModelProperty(value = "不良品数", example = "1")
    private BigDecimal unqualifiedNum;
    @ApiModelProperty(value = "日期")
    @JsonFormat(pattern = "MM/dd")
    private Date createTime;
}

 server/src/main/java/doumeemes/dao/business/dto/statistics/WorkPlansProcedureModel.java

@@ -22,4 +22,9 @@
    @ApiModelProperty(value = "工序编码", example = "1")
    private Integer procedureId;

    @ApiModelProperty(value = "计划数量", example = "1")
    private BigDecimal planNum;
    @ApiModelProperty(value = "已报工数量", example = "1")
    private BigDecimal doneNum;

}

 server/src/main/java/doumeemes/dao/business/model/Company.java

@@ -175,4 +175,7 @@
    @TableField(exist = false)
    private Department rootDepartment;

    @ApiModelProperty(value = "",hidden = true)
    @TableField(exist = false)
    private int isNew;
}

 server/src/main/java/doumeemes/dao/ext/dto/QueryMaterialDistributeExtDTO.java

@@ -273,6 +273,8 @@

    @ApiModelProperty(value = "分类小类id")
    private Integer cmodel3Id;
    @ApiModelProperty(value = "查询标识 1查询工艺路线工序" ,example = "0")
    private Integer queryType;


    @ApiModelProperty(value = "物料编码ids é€—号分割")

 server/src/main/java/doumeemes/dao/ext/vo/MaterialDistributeExtListVO.java

@@ -1,9 +1,6 @@
package doumeemes.dao.ext.vo;

import doumeemes.dao.business.model.Department;
import doumeemes.dao.business.model.Material;
import doumeemes.dao.business.model.Unit;
import doumeemes.dao.business.model.CategoryUnion;
import doumeemes.dao.business.model.*;
import doumeemes.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -12,6 +9,8 @@
import java.util.Date;

import java.io.Serializable;
import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2022/04/20 10:59
@@ -141,6 +140,8 @@

    @ApiModelProperty(value = "是否有bom：0=无；1=有")
    private Integer hasBom;
    @ApiModelProperty(value = "bom工艺路线关联所有的工序集合")
    private List<Procedures> procedureList;


}

 server/src/main/java/doumeemes/service/business/impl/UnitServiceImpl.java

@@ -38,10 +38,30 @@
    @Transactional
    public Integer create(Unit unit) {
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
            unit.setDeleted(Constants.ZERO);
            unit.setCreateTime(new Date());
            unit.setCreateUser(user.getId());
            unit.setRootDepartId(user.getRootDepartment().getId());
            unit.setStatus(Constants.ONE);
            unit.setType(Constants.ZERO);

            Unit find=new Unit();
            find.setRootDepartId(user.getRootDepartment().getId());
            find.setDeleted(Constants.ZERO);
            find.setName(unit.getName());
            if( this.count(find)>0){
                throw new RuntimeException("同一单位类型下名称不能重复");
            }else{
                unitMapper.insert(unit);
            }

        return 1;
    }
    public Integer createOld(Unit unit) {
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(StringUtils.isNotEmpty(unit.getTypes())){
            String [] str=unit.getTypes().split(",");
            for(String tp:str){

                unit.setDeleted(Constants.ZERO);
                unit.setCreateTime(new Date());
                unit.setCreateUser(user.getId());
@@ -97,7 +117,6 @@
    @Override
    public ApiResponse updateById(Unit unit) {
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();

        unit.setUpdateTime(new Date());
        unit.setUpdateUser(user.getId());


 server/src/main/java/doumeemes/service/ext/impl/CompanyExtServiceImpl.java

@@ -146,15 +146,15 @@
//     æ’å…¥ ä¼ä¸šè´¦æˆ·å¼€é€šåŽ†å²è®°å½•è¡¨
        CompanyOpen companyOpen = new CompanyOpen();
        companyOpen.setDeleted(Constants.ZERO);
//        companyOpen.setCreateUser();
        companyOpen.setCreateTime(new Date());
//        companyOpen.setUpdateUser();
        companyOpen.setUpdateTime(new Date());
        companyOpen.setCompanyId(com.getId());
//        companyOpen.setUserNum();
//        companyOpen.setModules();
        companyOpen.setValidDate(user.getOepnValidDate());
        companyOpen.setOepnType(user.getOepnType());
//        companyOpen.setCreateUser();
//        companyOpen.setUpdateUser();
//        companyOpen.setUserNum();
//        companyOpen.setModules();
        companyOpenExtMapper.insert(companyOpen);

        //创建根目录
@@ -243,7 +243,6 @@
            }
        }
        initRedisCache(com);

        systemUserBiz.importPlat(user,pwd,com);
        return com.getId();
    }
@@ -358,6 +357,7 @@
                com = new Company();
                com.setDeleted(Constants.ZERO);
                com.setCreateTime(new Date());
                com.setIsNew(Constants.ONE);
//                com.setOrigin(Constants.THREE);
                com.setCreditCode(user.getCreditCode());
                com.setName(user.getOrgName());

 server/src/main/java/doumeemes/service/ext/impl/MaterialDistributeExtServiceImpl.java

@@ -10,6 +10,7 @@
import doumeemes.dao.ext.MaterialDistributeExtMapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import doumeemes.service.ext.ProceduresExtService;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +26,9 @@
@Service
public class MaterialDistributeExtServiceImpl implements MaterialDistributeExtService {


    @Autowired
    private ProceduresExtService proceduresExtService;
    @Autowired
    private MaterialDistributeExtMapper materialDistributeExtMapper;

@@ -50,6 +54,10 @@
                        mev.setUnionCategoryName(mev.getCmodelName());
                    }
                }
                if(mev.getHasBom() >0 && Constants.equalsInteger(pageWrap.getModel().getQueryType(),Constants.ONE)){
                    //如果需要查询工艺路线工序,查询bom关联工艺路线的所有工序
                    mev.setProcedureList(proceduresExtService.getListByMaterialId(mev.getId()));
                }
            }
        }
        return PageData.from(new PageInfo<>(result));

 server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java

@@ -300,6 +300,8 @@
                            //完成率
                            tt.setRate(Constants.formatBigdecimal(t.getDoneNum()).divide(t.getPlanNum(),4).subtract(new BigDecimal(100)));
                        }
                        tt.setPlanNum(Constants.formatBigdecimal(t.getPlanNum()));
                        tt.setDoneNum(Constants.formatBigdecimal(t.getDoneNum()));
                        rList.add(tt);
                        //最后一列的良品数/完工数：为当前产品最后一道工序的良品数/完工数
                        model.setNum(t.getPlanNum());

 server/src/main/resources/mappers/PlansExtMapper.xml

@@ -303,7 +303,7 @@
    order by b.SORTNUM
  </select>
  <select id="selectStatisticsList" parameterType="doumeemes.dao.ext.dto.QueryPlansExtDTO" resultType="doumeemes.dao.business.dto.statistics.ProcedurePlansPageModel">
    select a.status,a.NUM,m.name as categoryName,m.code as materialCode
    select a.status,a.NUM,m.name as categoryName,m.code as materialCode,m.name as materialName
    ,(select sum(b.UNQUALIFIED_NUM) from workorder_record b where b.type=1 and b.DELETED=0 and b.PLAN_ID=a.id) as unqualifiedNum
    ,(select sum(b.QUALIFIED_NUM) from workorder_record b where b.type=1 and b.DELETED=0 and b.PLAN_ID=a.id) as qualifiedNum
    FROM `plans` `a`

 web_standard/package-lock.json

@@ -3901,9 +3901,9 @@
      }
    },
    "node_modules/caniuse-lite": {
      "version": "1.0.30001356",
      "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001356.tgz",
      "integrity": "sha512-/30854bktMLhxtjieIxsrJBfs2gTM1pel6MXKF3K+RdIVJZcsn2A2QdhsuR4/p9+R204fZw0zCBBhktX8xWuyQ==",
      "version": "1.0.30001522",
      "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001522.tgz",
      "integrity": "sha512-TKiyTVZxJGhsTszLuzb+6vUZSjVOAhClszBr2Ta2k9IwtNBT/4dzmL6aywt0HCgEZlmwJzXJd8yNiob6HgwTRg==",
      "dev": true
    },
    "node_modules/case-sensitive-paths-webpack-plugin": {
@@ -19315,6 +19315,63 @@
          "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
          "dev": true
        },
        "ansi-styles": {
          "version": "4.3.0",
          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
          "dev": true,
          "optional": true,
          "requires": {
            "color-convert": "^2.0.1"
          }
        },
        "chalk": {
          "version": "4.1.2",
          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
          "dev": true,
          "optional": true,
          "requires": {
            "ansi-styles": "^4.1.0",
            "supports-color": "^7.1.0"
          }
        },
        "color-convert": {
          "version": "2.0.1",
          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
          "dev": true,
          "optional": true,
          "requires": {
            "color-name": "~1.1.4"
          }
        },
        "color-name": {
          "version": "1.1.4",
          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
          "dev": true,
          "optional": true
        },
        "has-flag": {
          "version": "4.0.0",
          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
          "dev": true,
          "optional": true
        },
        "loader-utils": {
          "version": "2.0.4",
          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
          "dev": true,
          "optional": true,
          "requires": {
            "big.js": "^5.2.2",
            "emojis-list": "^3.0.0",
            "json5": "^2.1.2"
          }
        },
        "ssri": {
          "version": "8.0.1",
          "resolved": "https://registry.npm.taobao.org/ssri/download/ssri-8.0.1.tgz?cache=0&sync_timestamp=1617826515595&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fssri%2Fdownload%2Fssri-8.0.1.tgz",
@@ -19322,6 +19379,28 @@
          "dev": true,
          "requires": {
            "minipass": "^3.1.1"
          }
        },
        "supports-color": {
          "version": "7.2.0",
          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
          "dev": true,
          "optional": true,
          "requires": {
            "has-flag": "^4.0.0"
          }
        },
        "vue-loader-v16": {
          "version": "npm:vue-loader@16.8.3",
          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
          "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
          "dev": true,
          "optional": true,
          "requires": {
            "chalk": "^4.1.0",
            "hash-sum": "^2.0.0",
            "loader-utils": "^2.0.0"
          }
        }
      }
@@ -20664,9 +20743,9 @@
      }
    },
    "caniuse-lite": {
      "version": "1.0.30001356",
      "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001356.tgz",
      "integrity": "sha512-/30854bktMLhxtjieIxsrJBfs2gTM1pel6MXKF3K+RdIVJZcsn2A2QdhsuR4/p9+R204fZw0zCBBhktX8xWuyQ==",
      "version": "1.0.30001522",
      "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001522.tgz",
      "integrity": "sha512-TKiyTVZxJGhsTszLuzb+6vUZSjVOAhClszBr2Ta2k9IwtNBT/4dzmL6aywt0HCgEZlmwJzXJd8yNiob6HgwTRg==",
      "dev": true
    },
    "case-sensitive-paths-webpack-plugin": {
@@ -30875,87 +30954,6 @@
          "resolved": "https://registry.npm.taobao.org/hash-sum/download/hash-sum-1.0.2.tgz",
          "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=",
          "dev": true
        }
      }
    },
    "vue-loader-v16": {
      "version": "npm:vue-loader@16.8.3",
      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
      "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
      "dev": true,
      "optional": true,
      "requires": {
        "chalk": "^4.1.0",
        "hash-sum": "^2.0.0",
        "loader-utils": "^2.0.0"
      },
      "dependencies": {
        "ansi-styles": {
          "version": "4.3.0",
          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
          "dev": true,
          "optional": true,
          "requires": {
            "color-convert": "^2.0.1"
          }
        },
        "chalk": {
          "version": "4.1.2",
          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
          "dev": true,
          "optional": true,
          "requires": {
            "ansi-styles": "^4.1.0",
            "supports-color": "^7.1.0"
          }
        },
        "color-convert": {
          "version": "2.0.1",
          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
          "dev": true,
          "optional": true,
          "requires": {
            "color-name": "~1.1.4"
          }
        },
        "color-name": {
          "version": "1.1.4",
          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
          "dev": true,
          "optional": true
        },
        "has-flag": {
          "version": "4.0.0",
          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
          "dev": true,
          "optional": true
        },
        "loader-utils": {
          "version": "2.0.4",
          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
          "dev": true,
          "optional": true,
          "requires": {
            "big.js": "^5.2.2",
            "emojis-list": "^3.0.0",
            "json5": "^2.1.2"
          }
        },
        "supports-color": {
          "version": "7.2.0",
          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
          "dev": true,
          "optional": true,
          "requires": {
            "has-flag": "^4.0.0"
          }
        }
      }
    },

 web_standard/src/components/ext/OperaDeviceExtWindow.vue

@@ -162,8 +162,8 @@
      user: [],
      level: [
        //  0设备 1组
        { name: '设备组', id: 0 },
        { name: '设备', id: 1 }
        { name: '设备', id: 1 },
        { name: '设备组', id: 0 }
      ],
      // è¡¨å•æ•°æ®
      form: {
@@ -198,7 +198,7 @@
          { max: 20, message: '输入字数不超过20', trigger: 'blur' }
        ],
        model: [
          { required: true, message: '请输入设型号', trigger: 'blur' },
          { required: false, message: '请输入设型号', trigger: 'blur' },
          { max: 20, message: '输入字数不超过20', trigger: 'blur' }
        ],
        procedureId: [{ required: true, message: '请选择工序', trigger: 'change' }],
@@ -230,6 +230,7 @@
    //   .catch(err => {
    //     console.log(err)
    //   })
    this.form.type=1;
  },
  methods: {
    confirm() {

 web_standard/src/components/ext/OperaRouteDetail.vue

@@ -34,7 +34,7 @@
        <!-- <el-table-column prop="sortNum" label="加工顺序" min-width="100px"></el-table-column> -->
        <el-table-column label="工序类型" prop="type" min-width="100px">
          <template slot-scope="{row}">
            {{ row.level == 1 ? '委外' : '自有' }}
            {{ row.type == 1 ? '委外' : '自有' }}
          </template>
        </el-table-column>
          <!-- <el-table-column prop="userId" label="负责人" min-width="100px"></el-table-column> -->

 web_standard/src/components/ext/OperaUnitExtWindow.vue

@@ -19,7 +19,7 @@
          </el-option>
        </el-select>
      </el-form-item>
      <el-form-item v-if="form.id" label="单位类型" prop="type">
     <!-- <el-form-item v-if="form.id" label="单位类型" prop="type">
        <el-select v-model="form.type" filterable clearable placeholder="请选择">
          <el-option
            v-for="(item, index) in unitTypes"
@@ -28,7 +28,7 @@
            :value="item.id">
          </el-option>
        </el-select>
      </el-form-item>
      </el-form-item>-->
      <el-form-item v-else label="单位类型" prop="types">
        <el-select v-model="form.types" multiple filterable clearable placeholder="请选择">
          <el-option
@@ -57,8 +57,8 @@
        id: null,
        name: '',
        attributeData: 0,
        types: [],
        type: null
        //types: [],
     //   type: null
      },
      // éªŒè¯è§„则
      rules: {
@@ -68,12 +68,6 @@
        ],
        attributeData: [
          { required: true, message: '请选择单位属性', trigger: 'change' }
        ],
        types: [
          { required: true, message: '请选择单位类型', trigger: 'change' }
        ],
        type: [
          { required: true, message: '请选择单位类型', trigger: 'change' }
        ]
      },
      unitTypes: [

 web_standard/src/components/ext/OperaWInboundExtWindow.vue

@@ -101,6 +101,18 @@
          </el-select>
        </template>
      </el-table-column>
       <el-table-column  v-if="winType==2" label="工序" min-width="100px">
              <template slot-scope="{row}">
                <el-select v-model="row.procedureId" filterable placeholder="请选择" @select="selectProcedure">
                  <el-option
                    v-for="(item, index) in row.procedureList"
                    :key="index"
                    :label="item.name"
                    :value="item.id">
                  </el-option>
                </el-select>
              </template>
            </el-table-column>
      <el-table-column label="批次号" min-width="100px">
        <template slot-scope="{row}">
          <el-input v-model="row.batch" placeholder="请输入批次号" v-trim/>
@@ -154,6 +166,7 @@
        origin: 0,
        woutboundInBodyBeanList: []
      },
      winType:0,
      disabled: false,
      pickerOptions: {},
      tempWarehouses: [],
@@ -220,6 +233,7 @@
    open (title, type = 0) {
      this.title = title
      this.visible = true
      this.winType=type
      // æ–°å»º
      this.$nextTick(() => {
        this.$refs.form.resetFields()
@@ -383,7 +397,8 @@
          code: item.mmodelCode,
          name: item.mmodelUnionName,
          umodelName: item.umodelName,
          
          procedureList:item.procedureList,
          procedureId:null,
          locationId: this.whLocation.length ? this.whLocation[0].id : null,
          qualityType: this.whLocation.length ? 0 : this.houseProperty,
          materialId: item.id,

 web_standard/src/views/ext/unitDistributeExt.vue

@@ -5,7 +5,7 @@
      <el-form-item label="单位名称" prop="unitName">
          <el-input v-model="searchForm.unitName" placeholder="请输入单位名称" @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="单位类型" prop="unitType">
    <!--    <el-form-item label="单位类型" prop="unitType">
          <el-select v-model="searchForm.unitType" filterable clearable placeholder="请选择">
            <el-option
              v-for="(item, index) in unitTypes"
@@ -14,7 +14,7 @@
              :value="item.id">
            </el-option>
          </el-select>
        </el-form-item>
        </el-form-item> -->
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
@@ -35,12 +35,11 @@
      >
        <el-table-column type="selection" fixed="left" width="55"></el-table-column>
        <el-table-column prop="name" label="单位名称" min-width="100px"></el-table-column>
        <el-table-column prop="type" label="单位类型" min-width="100px">
          <!-- 0.主单位，1.采购单位，2.库存单位 -->
        <!--<el-table-column prop="type" label="单位类型" min-width="100px">
          <template slot-scope="{row}">
            {{ getTypes(row.type) }}
          </template>
        </el-table-column>
        </el-table-column>-->
        <el-table-column prop="createTime" label="创建时间" min-width="140px"></el-table-column>
        <el-table-column prop="status" label="状态" min-width="100px">
          <!-- 0禁用 1启用 -->

 web_standard/yarn.lock

ÎļþÌ«´ó