update:修改查看图片和日期组件

common/http.api.js

@@ -359,6 +359,13 @@ const install = (Vue, vm) => {
           vm.$u.get(
             config.adminPath + '/mes/md/sop/getProWorkder/' + params.workorderId
           ),
+        //查看规格书详情
+        viewSpecificationSheetInfo: (params = {}) =>
+          vm.$u.get(
+            config.adminPath +
+              '/pro/specificationSheet/info/' +
+              params.workorderId
+          ),
       },
 
       // 增删改查例子

pages/index/index.vue

@@ -23,7 +23,7 @@
             <u-col span="3" v-for="(card, index) in workUnitList" :key="index">
               <u-card class="station_card" :show-foot="false" :title="'工作单元' + card.workunitCode">
                 <view class="station_card_text" slot="body">
-                  {{ '工作单元名称：' + card.workunitName }}
+                  <view class="workunitName">{{ '工作单元名称：' + card.workunitName }}</view>
                   <u-button type="primary" @click="setWorkUnit(card)" style="margin-top: 30rpx">选择</u-button>
                 </view>
               </u-card>
@@ -376,9 +376,18 @@ img {
 
 .station_card {
   /* width: 250px; */
-  height: 150px;
+  height: 170px;
+  
+}
+.workunitName {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  line-clamp: 2;
+  -webkit-box-orient: vertical;
+  height:38px;
 }
-
 .common-main {
   flex: 1;
   height: 100%;

pages/mes/prodReport/components/ProogingSpecificationSheet.vue

@@ -3,8 +3,8 @@
       <u-form label-width="120px" :model="form" labelAlign="right">
         <u-row>
           <u-col span="4">
-            <u-form-item label="规格书类型:" prop="specificationSheetType">
-              {{ form.specificationSheetType }}
+            <u-form-item label="规格书类型:" prop="specificationSheetTypeStr">
+              {{ form.specificationSheetTypeStr }}
             </u-form-item>
           </u-col>
           <u-col span="4">
@@ -107,11 +107,11 @@
               {{ form.isAddSimple }}
             </u-form-item>
           </u-col>
-          <u-col span="4">
+          <!-- <u-col span="4">
             <u-form-item label="AI/PDF文档:" prop="aiOrPdfDocuments">
               {{ form.aiOrPdfDocuments }}
             </u-form-item>
-          </u-col>
+          </u-col> -->
           <u-col span="4">
             <u-form-item label="配方:" prop="formula">
               {{ form.formula }}
@@ -133,8 +133,8 @@
             </u-form-item>
           </u-col>
           <u-col span="4">
-            <u-form-item label="角型:" prop="shape">
-              {{ form.shape }}
+            <u-form-item label="角型:" prop="shapeStr">
+              {{ form.shapeStr }}
             </u-form-item>
           </u-col>
           <u-col span="4">
@@ -164,8 +164,8 @@
           </u-col>
           
           <u-col span="4">
-            <u-form-item label="客户确认人:" prop="customerConfirmedBy">
-              {{ form.customerConfirmedBy }}
+            <u-form-item label="客户确认人:" prop="customerConfirmedByStr">
+              {{ form.customerConfirmedByStr }}
             </u-form-item>
           </u-col>
           <u-col span="4">
@@ -174,30 +174,30 @@
             </u-form-item>
           </u-col>
           <u-col span="4">
-            <u-form-item label="研发核准人:" prop="rdApprovedBy">
-              {{ form.rdApprovedBy }}
+            <u-form-item label="研发核准人:" prop="rdApprovedByStr">
+              {{ form.rdApprovedByStr }}
             </u-form-item>
           </u-col>
           <u-col span="4">
-            <u-form-item label="研发审核人:" prop="rdReviewedBy">
-              {{ form.rdReviewedBy }}
+            <u-form-item label="研发审核人:" prop="rdReviewedByStr">
+              {{ form.rdReviewedByStr }}
             </u-form-item>
           </u-col>
-          <u-col span="12">
-            <u-form-item label="研发制定人:" prop="rdPreparedBy">
-              {{ form.rdPreparedBy }}
+          <u-col span="4">
+            <u-form-item label="研发制定人:" prop="rdPreparedByStr">
+              {{ form.rdPreparedByStr }}
             </u-form-item>
           </u-col>
           <u-col span="6">
             <u-form-item label="产品正面:" prop="frontImg">
               <!-- {{ form.frontImg }} -->
-              <image :src="form.frontImg" mode="aspectFill"></image>
+              <image style="width: 90%;" :src="form.frontImg" @click="onPreviewTap(form.frontImg)" mode="aspectFill"></image>
             </u-form-item>
           </u-col>
           <u-col span="6">
             <u-form-item label="产品背面:" prop="backImg">
               <!-- {{ form.backImg }} -->
-              <image :src="form.backImg" mode="aspectFill"></image>
+              <image style="width: 90%;" :src="form.backImg" @click="onPreviewTap(form.backImg)" mode="aspectFill"></image>
             </u-form-item>
           </u-col>
         </u-row>
@@ -207,11 +207,20 @@
 
 <script>
 export default {
-  data() {
-    return {
-      form: {}
+  props: {
+    form: {
+      type: Object,
+      default: {}
     }
   },
+  methods: {
+    onPreviewTap(url) {
+      uni.previewImage({
+        current: url,
+        urls: [url]
+      });
+    },
+  }
 }
 </script>
 

pages/mes/prodReport/index.vue

@@ -709,7 +709,7 @@
           <!-- <view style="display: flex; justify-content: space-between; flex-wrap: wrap">
             <image v-for="(line, index) in viewSop" :key="index" @click="onPreviewTap(line)" style="padding: 10px" class="u-avatar-demo" :src="line" mode="aspectFill"></image>
           </view> -->
-          <ProogingSpecificationSheet></ProogingSpecificationSheet>
+          <ProogingSpecificationSheet v-if="material" :form="ProogingSpecificationSheetForm"></ProogingSpecificationSheet>
         </scroll-view>
       </view>
     </u-modal>
@@ -777,6 +777,7 @@ export default {
   },
   data() {
     return {
+      ProogingSpecificationSheetForm: {},
       knifeTempAppScanVisible: false,
       knifeTempType: null,
       workunitVisible: false,
@@ -2264,14 +2265,14 @@ export default {
       this.materialReturnSelected = line;
     },
     viewSopsShow(row) {
-      this.material = true;
       // this.viewSopPicture = this.tableSelectData[0];
-      this.$u.api.viewpicture.viewSop({ workorderId: Number(row.workorderId) }).then((res) => {
+      this.$u.api.viewpicture.viewSpecificationSheetInfo({ workorderId: Number(row.workorderId) }).then((res) => {
         if (res.code === 200) {
           console.log(res.data);
-          this.viewSop = res.data;
+          this.ProogingSpecificationSheetForm = res.data;
         }
       });
+      this.material = true;
     },
     materialReturnSetting() {
       this.materialReturnSelected.applyNum = this.materialReturnFormData.applyNum;

uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue

@@ -461,7 +461,7 @@
 				const {
 					windowWidth
 				} = uni.getSystemInfoSync()
-				this.isPhone = windowWidth <= 500
+				this.isPhone = windowWidth <= 1200
 				this.windowWidth = windowWidth
 			},
 			show() {