瀏覽代碼

Merge branch 'deploy_0804' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into deploy_0804

lilei 3 年之前
父節點
當前提交
33d174a46c

+ 1 - 1
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -101,7 +101,7 @@
                     :src="record.productMainPic && record.productMainPic.imageUrl?(record.productMainPic.imageUrl+'?x-oss-process=image/resize,h_30,m_lfit'):defImg"
                     width="30"
                     height="30"
-                    class="imageUrl"
+                    style="cursor: pointer;"
                     @click="handlePicDetail(record)" />
                 </template>
                 <!-- 产品编码 -->

+ 1 - 0
src/views/salesManagement/salesman/editModal.vue

@@ -49,6 +49,7 @@
               v-model="form.entryDate"
               type="date"
               :disabled-date="disabledDate"
+              :defaultValue="null"
               placeholder="请选择入职时间"
               style="width: 100%;"
             />