430文档V1

src/views/Outsourcing/OutsourcingPartsQuery/index.vue

@@ -78,7 +78,12 @@
         </el-table-column>
         <el-table-column label="规定到货日期" align="center" width="120">
           <template slot-scope="scope">
-            {{ scope.row.到货日期 ? scope.row.到货日期.split(' ')[0] : scope.row.到货日期 }}
+            {{ scope.row.到货日期 ? (scope.row.到货日期.split(' ')[0] !== '1900-01-01' ? scope.row.到货日期.split(' ')[0] : '') : scope.row.到货日期 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="到货日期" align="center" width="120">
+          <template slot-scope="scope">
+            {{ scope.row.到货时间 ? (scope.row.到货时间.split(' ')[0] !== '1900-01-01' ? scope.row.到货时间.split(' ')[0] : '') : scope.row.到货时间 }}
           </template>
         </el-table-column>
         <el-table-column label="外协员" align="center" width="70" show-overflow-tooltip>

src/views/Outsourcing/OutsourcingTaskExecution/index.vue

@@ -111,7 +111,7 @@
           </el-table-column>
           <el-table-column label="到货日期" align="center" width="150px">
             <template slot-scope="scope">
-              {{ scope.row.到货日期 }}
+              {{ scope.row.到货日期 !=='1900-01-01' ? scope.row.到货日期 : '' }}
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" width="80px">
@@ -247,7 +247,8 @@ export default {
       ManufacturerName: [], // 厂家名称
       rules: {
         外协厂家: [{ required: true, message: '请选择外协厂家', trigger: 'change' }],
-        运费: [{ required: true, message: '请输入运费', trigger: 'blur' }]
+        运费: [{ required: true, message: '请输入运费', trigger: 'blur' }],
+        到货日期: [{ required: true, message: '请输入日期', trigger: 'blur' }]
       },
       code: 0,
       code1: 0,
@@ -394,6 +395,7 @@ export default {
               外协工序: response.data[i].外协工序
             })
           }
+          console.log(this.List3, 999)
         }
         this.loading = false
       })

src/views/Outsourcing/OutsourcingTaskQuery/index.vue

@@ -220,6 +220,7 @@ export default {
       this.List3 = []
       getParts(row.外协加工任务单流水号).then(response => {
         this.List3 = response.data
+        console.log(response.data, 111)
         this.loading = false
       })
     },