Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui into master

package.json

@@ -55,6 +55,7 @@
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",
+    "print-js": "^1.5.0",
     "quill": "1.3.7",
     "screenfull": "4.2.0",
     "sortablejs": "1.8.4",

src/views/warehouseBusiness/inStock/index.vue

@@ -999,6 +999,14 @@
           align="center"
           label="上传人"
         >
+        <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.opUserName"
+              :disabled="browseStatus"
+              placeholder="上传人"
+              show-word-limit
+            />
+          </template>
         </el-table-column>
         <el-table-column
           prop="opDate"
@@ -1018,6 +1026,7 @@
           </template>
         </el-table-column>
         <el-table-column
+          prop="attachId"
           header-align="center"
           align="center"
           width="250PX"
@@ -1849,29 +1858,17 @@
       submitForm() {
         this.$refs["form"].validate((valid) => {
           if (valid) {
-            // let formData = new FormData()
-            // console.log(JSON.stringify(this.form));
-            // formData.append('tWarehouseBills', JSON.stringify(this.formData))
             let formData = new window.FormData();
             // 附件数据
             formData.append("tWarehouseBills", JSON.stringify(this.form));
-            console.log(JSON.stringify(this.form));
             // 附件数据
             formData.append("tWhgenleg", null);
-            // // 费用明细付款
+            // 费用明细付款
             formData.append("tWarehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
-            // // 收款
+            // 收款
             formData.append("tWarehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
-            // // 库存明细
+            // 库存明细
             formData.append("tWarehousebillsitems", JSON.stringify(this.dataList));
-            // 附件数据
-            // formData.append('tWhgenleg', dataForm)
-            // // 费用明细付款
-            // formData.append('tWarehousebillsfeesCr', dataForm)
-            // // 收款
-            // formData.append('tWarehousebillsfeesDr"', dataForm)
-            // // 库存明细
-            // formData.append('tWarehousebillsitems', dataForm)
             addWarehousebills(formData).then((response) => {
               console.log(response);
               this.msgSuccess("新增成功");