调整

.env.development

@@ -1,16 +1,16 @@
 # just a flag
 ENV='development'
 
-#VUE_APP_BASE_API = http://192.168.60.99:8004/
+VUE_APP_BASE_API = http://192.168.60.99:8004/
-#VUE_APP_UPLOAD_API = http://192.168.60.99:8004/api/admin/upload-file
+VUE_APP_UPLOAD_API = http://192.168.60.99:8004/api/admin/upload-file
 #VUE_APP_OA_URL= http://192.168.60.18:8001
 #VUE_APP_OA_URL_TYPE = '{"采购入库":51,"请示入库":54,"调拨入库":55,"领用出库":56,"处置出库":57,"调拨出库":53}'
 
 
 #正式
 
-VUE_APP_BASE_API = http://192.168.60.99:9004/
+#VUE_APP_BASE_API = http://192.168.60.99:9004/
-VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file
+#VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file
 
 # 正式oa
 VUE_APP_OA_URL = http://192.168.60.18:2021

public/print.html

@@ -64,6 +64,7 @@
                 "<img src='"+printObj['path']+"' style='width:3cm; height:3cm;display: inline-block'>"+
                 "<div style='display:inline-block;vertical-align: top;width:170px;font-size:14px'>"+
                   "<p style='margin:0'>类别:"+printObj['material_info_type']+"</p>"+
+                  "<p style='margin:0'>物资名称:"+printObj['zichanmingcheng']+"</p>"+
                  "<p style='margin:0'>规格:"+guige+"</p>"+
                   "<p style='margin:0'>型号:"+xinghao+"</p>"+
                   "<p style='margin:0'><span>批次:"+printObj['rukupici']+"</span><span>数量:</span>"+printObj['total_num']+"</p>"+

src/views/inventorys/index.vue

@@ -287,7 +287,7 @@
                 prop: 'zaikushuliang',
                 customFn: (row) => {
                   console.log("row",row)
-                  return (<span>{row.row.zaikushuliang}{row.row.jiliangdanwei?row.row.jiliangdanwei:''}</span>)
+                  return (<span>{row.row.total_num}{row.row.jiliangdanwei?row.row.jiliangdanwei:''}</span>)
                 }
               },
               {

src/views/outbounds/component/addoutbounds.vue

@@ -89,10 +89,10 @@
       <template v-if="activeStep===0" v-slot:jieyongbumen>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;" />借用部门：
+            <span style="color: red;font-weight: 600;padding-right: 4px;" />领用部门：
           </div>
           <div class="xy-table-item-content">
-            <el-input disabled v-model="form.jieyongbumen" placeholder="请填写借用部门" clearable style="width: 300px;" />
+            <el-input disabled v-model="form.jieyongbumen" placeholder="领用部门" clearable style="width: 300px;" />
           </div>
         </div>
       </template>
@@ -113,7 +113,7 @@
             <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>经办人：
           </div>
           <div class="xy-table-item-content">
-            <el-input v-model="form.jilurenyuan" placeholder="请输入经办人" clearable style="width: 300px;" />
+            <el-input v-model="form.jilurenyuan" disabled placeholder="请输入经办人" clearable style="width: 300px;" />
           </div>
         </div>
       </template>
@@ -136,7 +136,7 @@
       <template v-if="activeStep===0" v-slot:zuozhengwenjian>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>物资信息单：
+            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>物资信息单：
           </div>
           <div class="xy-table-item-content">
             <el-upload
@@ -475,10 +475,10 @@ export default {
           required: true,
           message: '请输入经办人'
         }],
-        zuozhengwenjian: [{
+        // zuozhengwenjian: [{
-          required: true,
+        //   required: true,
-          message: '请上传入库凭证'
+        //   message: '请上传入库凭证'
-        }]
+        // }]
       },
       isShowMingxi: false,
       mingxiObj: {

src/views/outbounds/index.vue

@@ -65,7 +65,7 @@
                 <Button v-if="scope.row.zhuangtai==0 || scope.row.zhuangtai==4" style="margin-right: 10px;" type="primary" size="small"
                  @click="toOaFollow(scope.row,scope.row.chukuleixing)">发起流程</Button>
 <!-- v-if="scope.row.zhuangtai==2 &&(isCkName=='仓库管理员'||roleName=='系统管理员')" -->
-                <Button v-if="scope.row.zhuangtai==2 &&(isCkName=='仓库管理员'||roleName=='系统管理员')"  style="margin-right: 10px;" type="primary" size="small"
+                <Button style="margin-right: 10px;" type="primary" size="small"
                 @click="printChuku(scope.row.id)">确认出库</Button>
 
                 <Poptip v-if="scope.row.zhuangtai==0" transfer confirm title="确认要删除该出库记录？"