huang_an 2 år sedan
förälder
incheckning
c97ff5bd36

+ 50 - 24
src/views/ledgerAssets/boat/components/baseInfo.vue

@@ -1,40 +1,32 @@
 <template>
   <div class="baseinfo-container">
+    <basicInfoVue ref="basicInfoRef" />
     <div class="basic-details-title border-none">
-      <span class="border-span">基本信息</span>
+      <span class="border-span">舟皿信息</span>
     </div>
     <el-descriptions title="" :column="4" size="medium" border>
       <el-descriptions-item>
-        <template slot="label"> 类别编码 </template>
-        {{ information.code }}
+        <template slot="label">槽数</template>
+        {{ categoryPallet.slotNum }}
       </el-descriptions-item>
       <el-descriptions-item>
-        <template slot="label"> 舟皿名称 </template>
-        {{ information.name }}
+        <template slot="label">角度</template>
+        {{ categoryPallet.angle }}
       </el-descriptions-item>
       <el-descriptions-item>
-        <template slot="label"> 型号</template>
-        {{ information.modelType }}
+        <template slot="label"></template>
+        {{ categoryPallet.palletLen ? categoryPallet.palletLen + 'mm' : null }}
       </el-descriptions-item>
       <el-descriptions-item>
-        <template slot="label"> 规格 </template>
-        {{ information.specification }}
+        <template slot="label"></template>
+        {{ categoryPallet.wilde ? categoryPallet.wilde + 'mm' : null }}
       </el-descriptions-item>
-      <el-descriptions-item :span="2">
-        <template slot="label"> 分类 </template>
-        {{ information.categoryLevelPath }}
-      </el-descriptions-item>
-      <!-- <el-descriptions-item>
-        <template slot="label"> 长/宽/高(mm) </template>
-       {{ information.extendField.palletLen }}/{{
-          information.extendField.wilde
-        }}/{{ information.extendField.hight }}
-      </el-descriptions-item> -->
       <el-descriptions-item>
-        <template slot="label"> 计量单位</template>
-        {{ information.measuringUnit }}
+        <template slot="label">高</template>
+        {{ categoryPallet.hight ? categoryPallet.hight + 'mm' : null }}
       </el-descriptions-item>
     </el-descriptions>
+
     <div class="basic-details-title border-none">
       <span class="border-span">舟皿明细</span>
     </div>
@@ -113,13 +105,34 @@
         </el-pagination>
       </div>
     </div>
+    <warehouseConfigVue ref="warehouseConfigRef" />
+    <productInfoVue ref="productInfoRef" />
+    <planVue ref="planRef" />
+    <qualityConfig ref="qualityConfigRef" />
+    <footerVue ref="footerVueRef" />
   </div>
 </template>
 
 <script>
   import { getPageSingle, getCount } from '@/api/ledgerAssets';
   import { getDetails } from '@/api/classifyManage/itemInformation.js';
+  import basicInfoVue from '../../components/basicInfo.vue';
+  import warehouseConfigVue from '../../components/warehouseConfig.vue';
+  import productInfoVue from '../../components/productInfo.vue';
+  import planVue from '../../components/plan.vue';
+  import qualityConfig from '../../components/qualityConfig.vue';
+  import { sysDict } from '@/utils/sys';
+  import footerVue from '../../components/footer.vue';
+
   export default {
+    components: {
+      basicInfoVue,
+      warehouseConfigVue,
+      productInfoVue,
+      planVue,
+      qualityConfig,
+      footerVue
+    },
     props: {
       rowId: {
         type: String,
@@ -142,7 +155,8 @@
           categoryId: this.rowId,
           positionType: 1
         },
-        countInfo: {}
+        countInfo: {},
+        categoryPallet: {}
       };
     },
     created() {
@@ -151,12 +165,24 @@
       this.getCountNum();
     },
     methods: {
-      getDetilInfo() {
-        getDetails(this.rowId).then((res) => {
+      async getDetilInfo() {
+        getDetails(this.rowId).then(async (res) => {
           this.information = res.category;
           if (typeof res.categoryPallet != 'string') {
             this.$set(this.information, 'extendField', res.categoryPallet);
           }
+          this.$nextTick(() => {
+            this.$refs.basicInfoRef.getDetailInfoAugr(res.category);
+            this.$refs.warehouseConfigRef.getDetailInfoAugr(res.categoryWms);
+            this.$refs.productInfoRef.getDetailInfoAugr(res.categoryMes);
+            this.$refs.planRef.getDetailInfoAugr(res.categoryAps);
+            this.$refs.qualityConfigRef.getDetailInfoAugr(res.categoryQms);
+            this.$refs.footerVueRef.getDetailInfoAugr(res.category);
+          });
+          this.categoryPallet = {
+            ...res.categoryPallet,
+            angle: await sysDict('角度', res.categoryPallet.angle)
+          };
         });
       },
       tabClick(val) {

+ 149 - 0
src/views/ledgerAssets/components/basicInfo.vue

@@ -0,0 +1,149 @@
+<template>
+  <!-- 基本信息 -->
+  <div class="baseinfo-container" style="padding: 0">
+    <div class="basic-details-title border-none">
+      <span class="border-span">基本信息</span>
+    </div>
+    <el-descriptions title="" :column="4" size="medium" border>
+      <el-descriptions-item>
+        <template slot="label"> 分类 </template>
+        {{ idata.categoryLevelName }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label"> 编码 </template>
+        {{ idata.code }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label"> 名称 </template>
+        {{ idata.name }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label"> 牌号</template>
+        {{ idata.brandNum }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label"> 型号 </template>
+        {{ idata.modelType }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label"> 规格 </template>
+        {{ idata.specification }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label"> 计量单位 </template>
+        {{ idata.measuringUnit }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label"> 重量单位 </template>
+        {{ idata.weightUnit }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label"> 包装单位 </template>
+        {{ idata.packingUnit }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label"> 体积 </template>
+        {{ idata.volume ? idata.volume + '/' : null }}{{ idata.volumeUnit }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label"> 毛重 </template>
+        {{ idata.roughWeight }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">净重 </template>
+        {{ idata.netWeight }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">所属部门 </template>
+        {{ idata.groupName }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">负责人 </template>
+        {{ idata.name }}
+      </el-descriptions-item>
+    </el-descriptions>
+  </div>
+</template>
+<script>
+  import { getDetailInfo } from '@/api/material/list';
+  import { getUserPage } from '@/api/system/organization';
+  export default {
+    data() {
+      return {
+        depInfo: {},
+        idata: {}
+      };
+    },
+    methods: {
+      async getDetailInfoAugr(data) {
+        const dep = await this.getDepUser(data.deptLeaderId, data.deptId);
+        this.idata = { ...data, groupName: dep.groupName, name: dep.name };
+      },
+      async getDepUser(id, depId) {
+        const res = await getUserPage({
+          pageNum: 1,
+          size: -1,
+          executeGroupId: id
+        });
+        const list = res.list;
+        for (const key in list) {
+          if (list[key].id == depId) {
+            return list[key];
+          }
+        }
+      }
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  .baseinfo-container {
+    background-color: #fff;
+    padding: 0px 20px 20px;
+    .content {
+      padding: 0 20px;
+    }
+    .basic-details-title {
+      font-size: 16px;
+      margin: 15px 0;
+    }
+    .upload-container {
+      display: flex;
+      .img-box {
+        width: 280px;
+        height: 342px;
+        border: 1px solid rgba(215, 215, 215, 1);
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        img {
+          max-width: 100%;
+        }
+      }
+      .file-list {
+        margin-left: 50px;
+        flex: 1;
+        display: flex;
+        justify-content: space-between;
+        flex-wrap: wrap;
+        justify-items: baseline;
+        align-content: flex-start;
+        .file-box {
+          width: 30%;
+          margin-bottom: 20px;
+          height: 57px;
+          text-align: center;
+          line-height: 55px;
+          border: 1px solid #1890ff;
+          color: #1890ff;
+          cursor: pointer;
+          &.disabled {
+            cursor: not-allowed;
+            border-color: rgba(215, 215, 215, 1);
+            color: rgba(215, 215, 215, 1);
+          }
+        }
+      }
+    }
+  }
+</style>

+ 102 - 0
src/views/ledgerAssets/components/footer.vue

@@ -0,0 +1,102 @@
+<template>
+  <!-- 基本信息 -->
+  <div class="baseinfo-container" style="padding: 0">
+    <div class="basic-details-title border-none">
+      <span class="border-span">备注信息</span>
+    </div>
+    <el-descriptions title="" :column="4" size="medium" border>
+      <el-descriptions-item>
+        <template slot="label">附件信息</template>
+        {{ idata.fileName }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">备注</template>
+        {{ idata.remark }}
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <div class="basic-details-title border-none">
+      <span class="border-span">关联信息</span>
+    </div>
+    <linkMsg
+      ref="linkMsgRef"
+      :id="idata.id"
+      :categoryLevelId="idata.categoryLevelId"
+      :categoryLevelGroupId="idata.categoryLevelGroupId"
+    />
+  </div>
+</template>
+<script>
+  import { getDetailInfo } from '@/api/material/list';
+  import { getUserPage } from '@/api/system/organization';
+  import linkMsg from '../equipment/components/link-msg.vue';
+  export default {
+    components: { linkMsg },
+    data() {
+      return {
+        depInfo: {},
+        idata: {}
+      };
+    },
+    methods: {
+      async getDetailInfoAugr(data) {
+        this.idata = {
+          ...data,
+          fileName: data.remarkAttach.map((item) => item.name).join(', ')
+        };
+      }
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  .baseinfo-container {
+    background-color: #fff;
+    padding: 0px 20px 20px;
+    .content {
+      padding: 0 20px;
+    }
+    .basic-details-title {
+      font-size: 16px;
+      margin: 15px 0;
+    }
+    .upload-container {
+      display: flex;
+      .img-box {
+        width: 280px;
+        height: 342px;
+        border: 1px solid rgba(215, 215, 215, 1);
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        img {
+          max-width: 100%;
+        }
+      }
+      .file-list {
+        margin-left: 50px;
+        flex: 1;
+        display: flex;
+        justify-content: space-between;
+        flex-wrap: wrap;
+        justify-items: baseline;
+        align-content: flex-start;
+        .file-box {
+          width: 30%;
+          margin-bottom: 20px;
+          height: 57px;
+          text-align: center;
+          line-height: 55px;
+          border: 1px solid #1890ff;
+          color: #1890ff;
+          cursor: pointer;
+          &.disabled {
+            cursor: not-allowed;
+            border-color: rgba(215, 215, 215, 1);
+            color: rgba(215, 215, 215, 1);
+          }
+        }
+      }
+    }
+  }
+</style>

+ 109 - 0
src/views/ledgerAssets/components/plan.vue

@@ -0,0 +1,109 @@
+<template>
+  <div>
+    <div class="basic-details-title border-none">
+      <span class="border-span">计划</span>
+    </div>
+    <el-descriptions title="" :column="4" size="medium" border>
+      <el-descriptions-item>
+        <template slot="label">固定提前期</template>
+        {{ idata.fixLeadTime }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">变动提前期</template>
+        {{ idata.changeLeadTime }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">检验提前期</template>
+        {{ idata.checkLeadTime }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">累计提前期</template>
+        {{ idata.cumLeadTime }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">提前期单位</template>
+        {{ idata.unit }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">订货间隔期</template>
+        {{ idata.orderIntervalTime ? idata.orderIntervalTime + '/' : null
+        }}{{ idata.orderIntervalUnit }}
+      </el-descriptions-item>
+    </el-descriptions>
+  </div>
+</template>
+<script>
+  import { getDetailInfo } from '@/api/material/list';
+  import { getUserPage } from '@/api/system/organization';
+  import { sysDict } from '@/utils/sys';
+  export default {
+    data() {
+      return {
+        idata: {}
+      };
+    },
+    methods: {
+      async getDetailInfoAugr(data) {
+        this.idata = {
+          ...data,
+          orderIntervalUnit: await sysDict(
+            '提前期单位',
+            data.orderIntervalUnit
+          ),
+          unit: await sysDict('提前期单位', data.unit)
+        };
+      }
+    }
+  };
+</script>
+<style lang="scss" scoped>
+  .baseinfo-container {
+    background-color: #fff;
+    padding: 0px 20px 20px;
+    .content {
+      padding: 0 20px;
+    }
+    .basic-details-title {
+      font-size: 16px;
+      margin: 15px 0;
+    }
+    .upload-container {
+      display: flex;
+      .img-box {
+        width: 280px;
+        height: 342px;
+        border: 1px solid rgba(215, 215, 215, 1);
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        img {
+          max-width: 100%;
+        }
+      }
+      .file-list {
+        margin-left: 50px;
+        flex: 1;
+        display: flex;
+        justify-content: space-between;
+        flex-wrap: wrap;
+        justify-items: baseline;
+        align-content: flex-start;
+        .file-box {
+          width: 30%;
+          margin-bottom: 20px;
+          height: 57px;
+          text-align: center;
+          line-height: 55px;
+          border: 1px solid #1890ff;
+          color: #1890ff;
+          cursor: pointer;
+          &.disabled {
+            cursor: not-allowed;
+            border-color: rgba(215, 215, 215, 1);
+            color: rgba(215, 215, 215, 1);
+          }
+        }
+      }
+    }
+  }
+</style>

+ 133 - 0
src/views/ledgerAssets/components/productInfo.vue

@@ -0,0 +1,133 @@
+<template>
+  <div>
+    <div class="basic-details-title border-none">
+      <span class="border-span">生产信息</span>
+    </div>
+    <el-descriptions title="" :column="4" size="medium" border>
+      <el-descriptions-item>
+        <template slot="label"> 是否齐套件</template>
+        {{ dictType[idata.isCompleteSet] }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">消耗波动</template>
+        {{ idata.consumWave ? idata.consumWave + '%' : null }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">变动损耗率</template>
+        {{ idata.changeLossRate ? idata.changeLossRate + '%' : null }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">固定损耗数</template>
+        {{ idata.fixLossNum }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">排程类型</template>
+        {{ idata.apsType }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">允许改型</template>
+        {{ dictType[idata.isModify] }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">允许返工返修</template>
+        {{ dictType[idata.isRework] }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">是否返回料</template>
+        {{ dictType[idata.isRematerial] }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">是否副产品</template>
+        {{ dictType[idata.isByProduct] }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">是否废品</template>
+        {{ dictType[idata.isWaste] }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">是否不良品</template>
+        {{ dictType[idata.isDefective] }}
+      </el-descriptions-item>
+    </el-descriptions>
+  </div>
+</template>
+<script>
+  import { getDetailInfo } from '@/api/material/list';
+  import { getUserPage } from '@/api/system/organization';
+  import { sysDict } from '@/utils/sys';
+  export default {
+    data() {
+      return {
+        dictType: {
+          1: '是',
+          0: '否'
+        },
+        dictPd: {
+          1: '逐个盘点',
+          2: '批量盘点'
+        },
+        depInfo: {},
+        idata: {}
+      };
+    },
+    methods: {
+      async getDetailInfoAugr(data) {
+        this.idata = {
+          ...data,
+          apsType: await sysDict('排程类型', data.apsType)
+        };
+      }
+    }
+  };
+</script>
+<style lang="scss" scoped>
+  .baseinfo-container {
+    background-color: #fff;
+    padding: 0px 20px 20px;
+    .content {
+      padding: 0 20px;
+    }
+    .basic-details-title {
+      font-size: 16px;
+      margin: 15px 0;
+    }
+    .upload-container {
+      display: flex;
+      .img-box {
+        width: 280px;
+        height: 342px;
+        border: 1px solid rgba(215, 215, 215, 1);
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        img {
+          max-width: 100%;
+        }
+      }
+      .file-list {
+        margin-left: 50px;
+        flex: 1;
+        display: flex;
+        justify-content: space-between;
+        flex-wrap: wrap;
+        justify-items: baseline;
+        align-content: flex-start;
+        .file-box {
+          width: 30%;
+          margin-bottom: 20px;
+          height: 57px;
+          text-align: center;
+          line-height: 55px;
+          border: 1px solid #1890ff;
+          color: #1890ff;
+          cursor: pointer;
+          &.disabled {
+            cursor: not-allowed;
+            border-color: rgba(215, 215, 215, 1);
+            color: rgba(215, 215, 215, 1);
+          }
+        }
+      }
+    }
+  }
+</style>

+ 118 - 0
src/views/ledgerAssets/components/qualityConfig.vue

@@ -0,0 +1,118 @@
+<template>
+  <div>
+    <div class="basic-details-title border-none">
+      <span class="border-span">质量配置</span>
+    </div>
+    <el-descriptions title="" :column="4" size="medium" border>
+      <el-descriptions-item>
+        <template slot="label">是否来料检验</template>
+        {{ dictType[idata.isComeCheck] }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">检验方案</template>
+        {{ idata.checkFormula }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">采购组织</template>
+        {{ idata.groupName }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">采购员</template>
+        {{ idata.name }}
+      </el-descriptions-item>
+    </el-descriptions>
+  </div>
+</template>
+<script>
+  import { getDetailInfo } from '@/api/material/list';
+  import { getUserPage } from '@/api/system/organization';
+  import { sysDict } from '@/utils/sys';
+  export default {
+    data() {
+      return {
+        idata: {},
+        dictType: {
+          1: '是',
+          0: '否'
+        }
+      };
+    },
+    methods: {
+      async getDetailInfoAugr(data) {
+        console.log('+++', data);
+
+        const dep = await this.getDepUser(data.checkDepart, data.checkPerson);
+        this.idata = {
+          ...data,
+          checkFormula: await sysDict('检验方案', data.checkFormula),
+          groupName: dep.groupName,
+          name: dep.name
+        };
+      },
+      async getDepUser(id, depId) {
+        const res = await getUserPage({
+          pageNum: 1,
+          size: -1,
+          executeGroupId: id
+        });
+        const list = res.list;
+        for (const key in list) {
+          if (list[key].id == depId) {
+            return list[key];
+          }
+        }
+      }
+    }
+  };
+</script>
+<style lang="scss" scoped>
+  .baseinfo-container {
+    background-color: #fff;
+    padding: 0px 20px 20px;
+    .content {
+      padding: 0 20px;
+    }
+    .basic-details-title {
+      font-size: 16px;
+      margin: 15px 0;
+    }
+    .upload-container {
+      display: flex;
+      .img-box {
+        width: 280px;
+        height: 342px;
+        border: 1px solid rgba(215, 215, 215, 1);
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        img {
+          max-width: 100%;
+        }
+      }
+      .file-list {
+        margin-left: 50px;
+        flex: 1;
+        display: flex;
+        justify-content: space-between;
+        flex-wrap: wrap;
+        justify-items: baseline;
+        align-content: flex-start;
+        .file-box {
+          width: 30%;
+          margin-bottom: 20px;
+          height: 57px;
+          text-align: center;
+          line-height: 55px;
+          border: 1px solid #1890ff;
+          color: #1890ff;
+          cursor: pointer;
+          &.disabled {
+            cursor: not-allowed;
+            border-color: rgba(215, 215, 215, 1);
+            color: rgba(215, 215, 215, 1);
+          }
+        }
+      }
+    }
+  }
+</style>

+ 136 - 0
src/views/ledgerAssets/components/warehouseConfig.vue

@@ -0,0 +1,136 @@
+<template>
+  <div>
+    <div class="basic-details-title border-none">
+      <span class="border-span">仓储配置</span>
+    </div>
+    <el-descriptions title="" :column="4" size="medium" border>
+      <el-descriptions-item>
+        <template slot="label"> 启用库存预警</template>
+        {{ dictType[idata.isWarn] }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">允许拆包</template>
+        {{ dictType[idata.isUnpack] }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">安全库存</template>
+        {{ idata.secureInventory }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">最小库存</template>
+        {{ idata.minInventory }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label"> 最大库存</template>
+        {{ idata.maxInventory }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">盘点模式</template>
+        {{ dictPd[idata.inventoryMode] }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">质保预警参考</template>
+        <!-- <DictSelection
+                dictName="质保预警参考"
+                clearable
+                v-model="idata.warrantyWarnRefer"
+              >
+              </DictSelection> -->
+        {{ idata.warrantyWarnRefer }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">保质期</template>
+        {{ idata.warrantyPeriod ? idata.warrantyPeriod + '/' : null
+        }}{{ idata.warrantyPeriodUnit }}
+      </el-descriptions-item>
+    </el-descriptions>
+  </div>
+</template>
+<script>
+  import { getDetailInfo } from '@/api/material/list';
+  import { getUserPage } from '@/api/system/organization';
+  import { sysDict } from '@/utils/sys';
+  export default {
+    data() {
+      return {
+        dictType: {
+          1: '是',
+          0: '否'
+        },
+        dictPd: {
+          1: '逐个盘点',
+          2: '批量盘点'
+        },
+        depInfo: {},
+        idata: {}
+      };
+    },
+    methods: {
+      async getDetailInfoAugr(data) {
+        this.idata = {
+          ...data,
+          warrantyPeriodUnit: await sysDict(
+            '保质期单位',
+            data.warrantyPeriodUnit
+          ),
+          warrantyWarnRefer: await sysDict(
+            '质保预警参考',
+            data.warrantyWarnRefer
+          )
+        };
+      }
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  .baseinfo-container {
+    background-color: #fff;
+    padding: 0px 20px 20px;
+    .content {
+      padding: 0 20px;
+    }
+    .basic-details-title {
+      font-size: 16px;
+      margin: 15px 0;
+    }
+    .upload-container {
+      display: flex;
+      .img-box {
+        width: 280px;
+        height: 342px;
+        border: 1px solid rgba(215, 215, 215, 1);
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        img {
+          max-width: 100%;
+        }
+      }
+      .file-list {
+        margin-left: 50px;
+        flex: 1;
+        display: flex;
+        justify-content: space-between;
+        flex-wrap: wrap;
+        justify-items: baseline;
+        align-content: flex-start;
+        .file-box {
+          width: 30%;
+          margin-bottom: 20px;
+          height: 57px;
+          text-align: center;
+          line-height: 55px;
+          border: 1px solid #1890ff;
+          color: #1890ff;
+          cursor: pointer;
+          &.disabled {
+            cursor: not-allowed;
+            border-color: rgba(215, 215, 215, 1);
+            color: rgba(215, 215, 215, 1);
+          }
+        }
+      }
+    }
+  }
+</style>

+ 16 - 14
src/views/ledgerAssets/mould/components/baseInfo.vue

@@ -1,9 +1,7 @@
 <template>
   <div class="baseinfo-container">
-    <div class="basic-details-title border-none">
-      <span class="border-span">基本信息</span>
-    </div>
-    <el-descriptions title="" :column="4" size="medium" border>
+    <basicInfoVue ref="basicInfoVueRef" />
+    <!-- <el-descriptions title="" :column="4" size="medium" border>
       <el-descriptions-item>
         <template slot="label"> 分类 </template>
         {{ categoryObj.categoryLevelName }}
@@ -60,7 +58,7 @@
         <template slot="label">负责人 </template>
         {{ depInfo.name }}
       </el-descriptions-item>
-    </el-descriptions>
+    </el-descriptions> -->
     <div class="basic-details-title border-none">
       <span class="border-span">模具信息</span>
     </div>
@@ -379,6 +377,7 @@
   import { getUserPage } from '@/api/system/organization';
   import { sysDict } from '@/utils/sys';
   import linkMsg from '../../equipment/components/link-msg.vue';
+  import basicInfoVue from '../../components/basicInfo.vue';
   export default {
     props: {
       rowId: {
@@ -386,7 +385,7 @@
         default: ''
       }
     },
-    components: { linkMsg },
+    components: { linkMsg, basicInfoVue },
     data() {
       return {
         categoryMold: {},
@@ -452,7 +451,16 @@
       async searchMoudol(id) {
         const res = await getDetailInfo(id);
         console.log(res);
-
+        this.categoryObj = {
+          ...res.category,
+          // deptId:
+          fileName: res.category.remarkAttach
+            .map((item) => item.name)
+            .join(', ')
+        };
+        this.$nextTick(() => {
+          this.$refs.basicInfoVueRef.getDetailInfoAugr(this.categoryObj);
+        });
         await this.searchDeptNodeClick(res.category.deptLeaderId);
         for (const key in this.depList) {
           if (this.depList[key].id == res.category.deptId) {
@@ -467,13 +475,7 @@
             break;
           }
         }
-        this.categoryObj = {
-          ...res.category,
-          // deptId:
-          fileName: res.category.remarkAttach
-            .map((item) => item.name)
-            .join(', ')
-        };
+
         this.categoryWms = {
           ...res.categoryWms,
           warrantyPeriodUnit: await sysDict(

+ 2 - 1
vue.config.js

@@ -34,7 +34,8 @@ module.exports = {
         // target: 'http://192.168.3.51:18086', // 测试环境
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.139:18086', // 粟
-        target: 'http://192.168.1.132:18086', // 徐
+        // target: 'http://192.168.1.132:18086', // 徐1
+        target: 'http://192.168.1.134:18086', //徐2
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''