0412 新看板

src/assets/scss/global.scss

@@ -419,3 +419,7 @@ a:hover{
   top: 85%;
   left: 0;
 }
+.el-table .cell, .el-table th div {
+  padding-right: 0px;
+  padding-left: 0px;
+}

src/views/modules/board/productionBlankingBoard.vue

@@ -34,14 +34,14 @@
           prop="partDescSpec"
           header-align="center"
           align="left"
-          min-width="102"
+          min-width="100"
           label="硫化产品名称">
         </el-table-column>
         <el-table-column
           prop="compPartDescSpec"
           header-align="center"
           align="left"
-          min-width="102"
+          min-width="100"
           label="混炼胶名称">
         </el-table-column>
         <el-table-column
@@ -83,7 +83,7 @@
           prop="planStartDate"
           header-align="center"
           align="center"
-          min-width="50"
+          min-width="55"
           label="需求日期">
         </el-table-column>
       </el-table>

src/views/modules/production/dailyPlanReport.vue

@@ -123,6 +123,13 @@
         min-width="70"
         label="是否入库">
       </el-table-column>
+<!--      <el-table-column-->
+<!--        prop="orderRef1"-->
+<!--        header-align="center"-->
+<!--        align="left"-->
+<!--        min-width="100"-->
+<!--        label="合并生产订单号">-->
+<!--      </el-table-column>-->
     </el-table>
     <el-dialog  :close-on-click-modal="false" :close-on-press-escape="false" v-drag title="周计划清单" :visible.sync="detailFlag" width="600px">
       <el-table
@@ -352,7 +359,12 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          cancelTask(row).then(({data}) => {
+          let inData={
+            site:row.site,
+            taskNo:row.taskNo,
+            userId:this.$store.state.user.name
+          }
+          cancelTask(inData).then(({data}) => {
             if (data && data.code === 0) {
               this.search ();
               this.$message({

src/views/modules/production/searchHunlianTask.vue

@@ -168,7 +168,13 @@
           min-width="100"
           label="周计划日期">
         </el-table-column>
-
+<!--        <el-table-column-->
+<!--          prop="orderRef1"-->
+<!--          header-align="center"-->
+<!--          align="left"-->
+<!--          min-width="100"-->
+<!--          label="合并生产订单号">-->
+<!--        </el-table-column>-->
       </el-table>
       <span slot="footer" class="dialog-footer">
       <el-button @click="detailFlag = false" type="primary">关闭</el-button>