chris 3 rokov pred
rodič
commit
92c1c9cc7b

+ 5 - 1
src/views/modules/production/equipment.vue

@@ -91,7 +91,11 @@
         prop="-"
         header-align="center"
         align="center"
-        label="操作说明书">
+        min-width="120"
+        label="使用说明书">
+        <template slot-scope="scope">
+          <a v-for="(item, index) in scope.row.attachList" :key="item.fileName + index" type="primary" :href="downloadUrl + item.url" target="_blank">{{ item.fileName }}</a>
+        </template>
       </el-table-column>
       <el-table-column
         prop="notes"

+ 10 - 2
src/views/modules/production/monitoring.vue

@@ -28,12 +28,16 @@
         prop="prodCode"
         header-align="center"
         align="center"
+        min-width="100"
+        :show-tooltip-when-overflow="true"
         label="产品编号">
       </el-table-column>
       <el-table-column
         prop="productName"
         header-align="center"
         align="center"
+        min-width="160"
+        :show-tooltip-when-overflow="true"
         label="产品名称">
       </el-table-column>
       <el-table-column
@@ -43,26 +47,30 @@
         min-width="100"
         label="生产进度">
         <template slot-scope="scope">
-          <el-progress :percentage="50"></el-progress>
+          <el-progress :percentage="scope.row.progressBar?Number(scope.row.progressBar):0"></el-progress>
         </template>
       </el-table-column>
       <el-table-column
         prop="contactDate"
         header-align="center"
         align="center"
+        min-width="160"
         label="交期时间">
       </el-table-column>
       <el-table-column
         prop="orderCode"
         header-align="center"
         align="center"
+        min-width="120"
+        :show-tooltip-when-overflow="true"
         label="订单编码">
       </el-table-column>
       <el-table-column
         prop="customerName"
         header-align="center"
         align="center"
-        min-width="120"
+        min-width="160"
+        :show-tooltip-when-overflow="true"
         label="客户名称">
       </el-table-column>
       <el-table-column

+ 8 - 0
src/views/modules/production/recording.vue

@@ -27,24 +27,32 @@
         prop="productName"
         header-align="center"
         align="center"
+        min-width="140"
+        :show-tooltip-when-overflow="true"
         label="产品名称">
       </el-table-column>
       <el-table-column
         prop="prodCode"
         header-align="center"
         align="center"
+        min-width="100"
+        :show-tooltip-when-overflow="true"
         label="产品编号">
       </el-table-column>
       <el-table-column
         prop="orderCode"
         header-align="center"
         align="center"
+        min-width="140"
+        :show-tooltip-when-overflow="true"
         label="订单编号">
       </el-table-column>
       <el-table-column
         prop="customerName"
         header-align="center"
         align="center"
+        min-width="160"
+        :show-tooltip-when-overflow="true"
         label="客户名称">
       </el-table-column>
       <el-table-column

+ 4 - 0
src/views/modules/production/scheduling-mould.vue

@@ -28,12 +28,16 @@
         prop="mouldName"
         header-align="center"
         align="center"
+        min-width="120"
+        :show-tooltip-when-overflow="true"
         label="模板名称">
       </el-table-column>
       <el-table-column
         prop="productName"
         header-align="center"
         align="center"
+        min-width="120"
+        :show-tooltip-when-overflow="true"
         label="产品名称">
       </el-table-column>
       <el-table-column