merge dev into test: 同步日期选择、sendGoods、按钮命名修复

src/views/produce/components/footBtn.vue

@@ -245,7 +245,7 @@
         ],
         btnList3: [
           {
-            name: '入库',
+            name: '发货',
             type: 'job',
             bjColor: '#157A2C'
           },

src/views/produce/components/jobBooking/index.vue

@@ -215,6 +215,7 @@
           </div>
 
           <div v-else>
+            <!-- :picker-options="pickerOptions" -->
             报工时间：
             <el-date-picker
               v-model="item.workReportInfo.executorTime"
@@ -223,7 +224,6 @@
               value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择日期"
               style="margin-right: 25px; width: 190px"
-              :picker-options="pickerOptions"
               @change="onSingleExecutorTimeChange(index)"
             >
             </el-date-picker>

src/views/produce/components/outsourcing/details.vue

@@ -284,7 +284,7 @@
         <el-link
           type="primary"
           :underline="false"
-          @click="sendGoods(row, 'receipt')"
+          @click="sendGoods(row, 'receipt', 3)"
           v-if="row.approvalStatus == 2 && row.sendStatus == 3"
         >
           收货
@@ -896,8 +896,8 @@
         return data.length != 0 ? data[0].label : '';
       },
 
-      sendGoods(item, type) {
-        this.$refs.goodsDetailRef.open(item, type);
+      sendGoods(item, type, detailType) {
+        this.$refs.goodsDetailRef.open(item, type, detailType);
       },
 
       open(type, row) {