Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

hb_client/src/views/inm/fifo.vue

@@ -319,7 +319,7 @@ export default {
         4: "生产入库",
         5: "其他入库",
       },
-      inpur: [],
+      inpur: {},
       listQuery: {
         page: 1,
         page_size: 20,

hb_client/src/views/mtm/productprocess.vue

@@ -578,7 +578,7 @@
                     :headers="upHeaders"
                     :file-list="fileList"
                     :limit="1"
-                    accept=".doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf"
+                    accept=".doc,.docx,.pdf,.jpg,.png,.tif,.gif,.apng"
                   >
                     <el-button size="small" type="primary">上传文件</el-button>
                   </el-upload>
@@ -642,7 +642,7 @@
   const defaultoutputmaterial = {};
   const defaultother = {};
   const defaultusedstep = {need_test:false};
-  const defaulttechdoc = {enabled: false};
+  const defaulttechdoc = {enabled: false,name:""};
   const defaultsubproducation = {
     need_combtest: false,
   };
@@ -1208,6 +1208,8 @@
 
       handleUpSuccess(res, file, filelist) {
         this.techdoc.file = res.data.id;
+        console.log(res.data);
+        this.techdoc.name = res.data.name;
       },
 
       handleRemove(file, filelist) {

hb_client/src/views/sam/salesdetail.vue

@@ -125,7 +125,7 @@
             :headers="upHeaders"
             :file-list="fileList"
             :limit="1"
-            accept="webp,bmp,jpg,png,tif,gif,apng"
+            accept=".webp,.bmp,.jpg,.png,.tif,.gif,.apng"
           >
             <el-button size="small" type="primary">上传文件</el-button>
           </el-upload>