修改

src/views/modules/home/workboard.vue

@@ -18,6 +18,7 @@
         <!-- 固定表头（4列） -->
         <div class="header-row">
           <div class="header-cell">姓名</div>
+          <div class="header-cell">未读消息</div>
           <div class="header-cell">待审批工单</div>
           <div class="header-cell">待处理工单</div>
           <div class="header-cell">等待工单</div>
@@ -31,6 +32,7 @@
           <ul>
             <li v-for="(item, index) in list" :key="index" class="content-row">
               <div class="content-cell">{{ item.userName }}</div>
+              <div class="content-cell">{{ item.unReadNum }}</div>
               <div class="content-cell">{{ item.pendingApprovalNum }}</div>
               <div class="content-cell">{{ item.pendingTaskNum }}</div>
               <div class="content-cell">{{ item.toBeginTaskNum }}</div>

src/views/modules/order/order-add-or-update.vue

@@ -37,7 +37,9 @@
                 :value-key="'label'"
                 placeholder="请输入合同号"
                 @select="handleSelect"
-              ></el-autocomplete>
+                popper-class="custom-dropdown"
+              >
+              </el-autocomplete>
             </el-form-item>
           </el-col>
           <el-col :span="8" style="padding-left: 20px">
@@ -110,14 +112,14 @@
               :show-tooltip-when-overflow="true"
               label="物料名称">
             </el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               prop="relatedProduct"
               header-align="center"
               align="center"
               width="120"
               :show-tooltip-when-overflow="true"
               label="物料关联">
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column
               prop="productSpecifications"
               header-align="center"
@@ -637,6 +639,9 @@ export default {
   }
 </script>
 
-<style scoped>
-
+<style lang="scss">
+.custom-dropdown {
+  width: auto !important;   /* 宽度自适应 */
+  max-width: 800px;         /* 限制最大宽度 */
+}
 </style>

src/views/modules/order/order-detail.vue

@@ -44,8 +44,7 @@
         </e-desc-item>
       </e-desc>
       <e-desc title="物料清单明细">
-        <el-table :data="productDetails" row-key="productId" border :indent='20' lazy :load="loadingData"
-          style="width: 100%;">
+        <el-table :data="productDetails" row-key="productId" border :indent='20' lazy :load="loadingData" style="width: 100%;">
           <el-table-column label="序号" type="index" width="50" align="center">
           </el-table-column>
           <el-table-column prop="mapNumber" header-align="center" align="left" width="160"
@@ -54,9 +53,9 @@
           <el-table-column prop="productName" header-align="center" align="left" width="160"
             :show-tooltip-when-overflow="true" label="物料名称">
           </el-table-column>
-          <el-table-column prop="relatedProduct" header-align="center" align="center" width="120"
+          <!-- <el-table-column prop="relatedProduct" header-align="center" align="center" width="120"
             :show-tooltip-when-overflow="true" label="物料关联">
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column header-align="center" align="center" min-width="100" :show-tooltip-when-overflow="true"
             label="简图">
             <template slot-scope="scope">
@@ -132,7 +131,7 @@
               <span>{{ !scope.row.appraisal ? '' : (Number(scope.row.appraisal) === 2 ? '是' : '否') }}</span>
             </template>
           </el-table-column>
-          <el-table-column header-align="center" align="center" width="120" :show-tooltip-when-overflow="true"
+          <!-- <el-table-column header-align="center" align="center" width="120" :show-tooltip-when-overflow="true"
             label="试制前检查">
             <template slot-scope="scope">
               <span>{{ !scope.row.inspect ? '' : (Number(scope.row.inspect) === 2 ? '是' : '否') }}</span>
@@ -151,7 +150,7 @@
               <el-button :disabled="!scope.row.attachListExamine || scope.row.attachListExamine.length === 0"
                 type="text" size="small" @click="attachDetails(scope.row.attachListExamine)">查看</el-button>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column prop="notes" header-align="center" align="center" min-width="120"
             :show-tooltip-when-overflow="true" label="备注">
           </el-table-column>
@@ -272,12 +271,13 @@ export default {
     getDetails(businessType) {
       getOrderDetail(this.id).then(({ data }) => {
         if (data && data.code === '200') {
+          console.log(data)
           this.dataForm = data.data
           // 流程图展示
-          if (data.data.workFlowBusinessExt.workFlowProcessStepList) {
+          if (data.data.workFlowBusinessExt && data.data.workFlowBusinessExt.workFlowProcessStepList) {
             dealStepData(data.data.workFlowBusinessExt.workFlowProcessStepList, this.stepList)
           }
-          if (data.data.workFlowBusinessExt.processLogList) {
+          if (data.data.workFlowBusinessExt && data.data.workFlowBusinessExt.processLogList) {
             dealStepLogs(data.data.workFlowBusinessExt.processLogList, this.logList)
           }
           if (data.data.workFlowProcessStepList) {

src/views/modules/production/plan-submit.vue

@@ -141,10 +141,11 @@
           label="备注">
         </el-table-column>
         <el-table-column
+          fixed="right"
           prop="materialCnt"
           header-align="center"
           align="center"
-          min-width="140"
+          width="70"
           :show-tooltip-when-overflow="true"
           label="库存数">
         </el-table-column>
@@ -153,7 +154,7 @@
           prop="planCnt"
           header-align="center"
           align="center"
-          width="120"
+          width="100"
           :show-tooltip-when-overflow="true"
           label="计划数量">
           <template slot-scope="scope">
@@ -167,7 +168,7 @@
           prop="disposal"
           header-align="center"
           align="center"
-          width="120"
+          width="90"
           :show-tooltip-when-overflow="true"
           label="处置">
           <template slot-scope="scope">
@@ -187,7 +188,7 @@
           prop="isTechnology"
           header-align="center"
           align="center"
-          width="120"
+          width="90"
           :show-tooltip-when-overflow="true"
           label="工艺">
           <template slot-scope="scope">

src/views/modules/tech/product-management.vue

@@ -38,7 +38,7 @@
           <el-button @click="search()">查询</el-button>
           <el-button v-if="isAuth('pro:product:save')" type="primary" @click="addOrUpdateHandle(0, false)">新建</el-button>
           <el-button v-if="isAuth('pro:product:noteChangeConfig')" type="primary" @click="setNoticeChangeHandel()">变更通知人设置</el-button>
-          <el-button type="primary" @click="importFromExcel">导入清单</el-button>
+          <!-- <el-button type="primary" @click="importFromExcel">导入清单</el-button> -->
           <el-button type="primary" @click="templateDownload">清单模板下载</el-button>
         </el-form-item>
       </el-form>

src/views/modules/tech/project-product.vue

@@ -15,6 +15,7 @@
         <el-form-item>
           <el-button @click="queryData()">查询</el-button>
           <el-button @click="noticeSettingHandle(null, false)">通知设置</el-button>
+          <el-button type="primary" @click="templateDownload">清单模板下载</el-button>
         </el-form-item>
       </el-form>
       <el-table
@@ -123,6 +124,7 @@
   import Assign from './project-product-assign'
   import Selection from './project-product-selection'
   import NoticeChange from './project-product-notice-change-setting'
+  import Vue from 'vue'
   export default {
     name: 'file-manage',
     components: {
@@ -164,6 +166,9 @@
         this.selectionVisible = false
         this.noticeChangeVisible = false
       },
+      templateDownload () {
+        location.href = this.$http.adornUrl(`/biz-service/product/template/download?_token=${Vue.cookie.get('token')}`)
+      },
       // 查询
       queryData () {
         this.pageIndex = 1