完善旧件模块

yxt-as-ui/src/views/storage/allocation/allocationAdd.vue

@@ -144,9 +144,9 @@
         formobj: {
           "sid": "",
           "billNo": "",
-          "createBySid": "",
+          "createBySid": window.sessionStorage.getItem('userSid'),
           "createDate": "",
-          "createUserSid": "",
+          "createUserSid":window.sessionStorage.getItem('userSid'),
           "outOrgSid": "",
           "inOrgSid": "",
           "count": "",
@@ -154,8 +154,8 @@
           "confirmSid": "",
           "confirmName": "",
           "finishTime": "",
-          "useOrgSid": "",
-          "createOrgName": "",
+          "useOrgSid": window.sessionStorage.getItem('orgSid'),
+          "createOrgName": window.sessionStorage.getItem('Orgname'),
           "wmsInventoryAllocateBillDetailNewList": []
         },
         rules: {},

yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue

@@ -212,7 +212,7 @@
           sourceBillNo: "",
           busTypeKey: "",
           busTypeValue: "",
-          createByName: "",
+          createByName: window.sessionStorage.getItem('name'),
           billState: 0,
           reviewStatus: "",
           refuseReason: "",

yxt-as-ui/src/views/storage/oldPartsCope/oldPartsCopeAdd.vue

@@ -230,16 +230,16 @@
         formobj: {
           "sid": "",
           "remarks": "",
-          "createBySid": "",
-          "createByName": "",
-          "createDeptSid": "",
-          "createDeptName": "",
+          "createBySid":  window.sessionStorage.getItem('userSid'),
+          "createByName": window.sessionStorage.getItem('name'),
+          "createDeptSid":  window.sessionStorage.getItem('departmentSid'),
+          "createDeptName":  window.sessionStorage.getItem('departmentName'),
           "createTime": "",
           "billNo": "",
           "filePaths": [],
-          "useOrgSid": "",
-          "useOrgName": "",
-          "orgSidPath": "",
+          "useOrgSid": window.sessionStorage.getItem('orgSid'),
+          "useOrgName": window.sessionStorage.getItem('Orgname'),
+          "orgSidPath":  window.sessionStorage.getItem('orgSidPath'),
           "procDefId": "",
           "nodeId": "",
           "procInstId": "",

yxt-as-ui/src/views/storage/oldPartsFactory/oldPartsFactoryAdd.vue

@@ -196,16 +196,16 @@
         formobj: {
           "sid": "",
           "remarks": "",
-          "createBySid": "",
-          "createByName": "",
-          "createDeptSid": "",
-          "createDeptName": "",
+          "createBySid": window.sessionStorage.getItem('userSid'),
+          "createByName": window.sessionStorage.getItem('name'),
+          "createDeptSid": window.sessionStorage.getItem('departmentSid'),
+          "createDeptName": window.sessionStorage.getItem('departmentName'),
           "createTime": "",
           "billNo": "",
           "filePaths": [],
-          "useOrgSid": "",
-          "useOrgName": "",
-          "orgSidPath": "",
+          "useOrgSid": window.sessionStorage.getItem('orgSid'),
+          "useOrgName": window.sessionStorage.getItem('Orgname'),
+          "orgSidPath": window.sessionStorage.getItem('orgSidPath'),
           "procDefId": "",
           "nodeId": "",
           "procInstId": "",

yxt-as-ui/src/views/storage/oldPartsInStorage/oldPartsInStorageAdd.vue

@@ -16,6 +16,7 @@
     <div class="listconadd">
 
       <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+
         <el-row class="first_row">
 
           <el-col :span="12">

yxt-as-ui/src/views/storage/oldPartsRecovery/oldPartsRecoveryAdd.vue

@@ -12,113 +12,75 @@
       <!-- end 详情按钮 -->
     </div>
     <div class="listconadd">
-      <el-form ref="form_obj" :model="formobj" label-position="top" label-width="190px" class="formadd">
-        <div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
-          <div>基础信息</div>
-        </div>
+     <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+       <div class="title">
+         <div>基础信息</div>
+       </div>
         <el-row class="first_row">
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">维修工单编号</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <span slot="label">{{formobj.billNo}}</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">申请人</span>
-            </el-form-item>
+
+          <el-col :span="12">
+            <div class="span-sty">维修工单编号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <span slot="label">{{formobj.createByName}}</span>
-            </el-form-item>
+          <el-col :span="12">
+            <div class="span-sty">申请人</div>
+             <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
           </el-col>
+
         </el-row>
+
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">分公司</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <span slot="label">{{formobj.useOrgName}}</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">申请部门</span>
-            </el-form-item>
+
+          <el-col :span="12">
+            <div class="span-sty">分公司</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <span slot="label">{{formobj.createDeptName}}</span>
-            </el-form-item>
+          <el-col :span="12">
+            <div class="span-sty">申请部门</div>
+             <el-form-item><span class="addinputInfo">{{ formobj.createDeptName }}</span></el-form-item>
           </el-col>
+
         </el-row>
+
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">申请日期</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-date-picker v-model="formobj.createTime" type="date" style="width:100%" value-format="yyyy-MM-dd"
+
+          <el-col :span="12">
+            <div class="span-sty">申请日期</div>
+            <el-form-item><el-date-picker v-model="formobj.createTime" type="date" class="addinputInfo"value-format="yyyy-MM-dd"
                 placeholder="选择日期">
               </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">流程状态</span>
-            </el-form-item>
+              </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <span slot="label">{{formobj.nodeState}}</span>
-            </el-form-item>
+          <el-col :span="12">
+            <div class="span-sty">流程状态</div>
+             <el-form-item><span class="addinputInfo">{{ formobj.nodeState }}</span></el-form-item>
           </el-col>
+
         </el-row>
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">备注</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="20">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.remarks" placeholder="" class="addinputw"
-                style="width: 100%; padding-bottom: 5px;" type="textarea" :rows="4" clearable />
-            </el-form-item>
+
+          <el-col :span="24">
+            <div class="span-sty">备注</div>
+             <el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputw" type="textarea" :rows="4" clearable />
+             </el-form-item>
           </el-col>
 
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">附件</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="20">
-            <el-form-item class="trightb_item">
+          <el-col :span="24">
+              <div class="span-sty">附件</div>
+            <el-form-item >
               <upload style="margin-top: 20px;margin-bottom: 20px;" class="addinputw" ref="uploadImg2" v-model="imgList"
                 :limit="9" @change="backData" bucket="map" :upload-data="{ type: '0001' }"></upload>
             </el-form-item>
           </el-col>
 
         </el-row>
-        <div class="title"
-          style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
+        <div class="title titleOne">
           <div>返厂旧件列表</div>
         </div>
-        <el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border style="width: 100%;"
-          :row-style="{height: '40px'}">
+        <el-table v-loading="listLoading" :data="formobj.asOldpartreturnList" border >
           <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
           <el-table-column align="center" width="100" :render-header="commodityHeader">
             <template slot-scope="scope">
@@ -229,16 +191,16 @@
         formobj: {
           "sid": "",
           "remarks": "",
-          "createBySid": "",
-          "createByName": "",
-          "createDeptSid": "",
-          "createDeptName": "",
+          "createBySid": window.sessionStorage.getItem('userSid'),
+          "createByName": window.sessionStorage.getItem('name'),
+          "createDeptSid": window.sessionStorage.getItem('departmentSid'),
+          "createDeptName": window.sessionStorage.getItem('departmentName'),
           "createTime": "",
           "billNo": "",
           "filePaths": [],
-          "useOrgSid": "",
-          "useOrgName": "",
-          "orgSidPath": "",
+          "useOrgSid": window.sessionStorage.getItem('orgSid'),
+          "useOrgName": window.sessionStorage.getItem('Orgname'),
+          "orgSidPath": window.sessionStorage.getItem('orgSidPath'),
           "procDefId": "",
           "nodeId": "",
           "procInstId": "",
@@ -508,48 +470,29 @@
     }
   }
 </script>
-<style lang="scss" scoped>
-  // 隐藏上传组件
-
-  ::v-deep .hide {
-    .el-upload--picture-card {
-      display: none !important;
-    }
+<style scoped>
+  .span-sty {
+    width: 130px !important;
   }
 
-  .trightb {
-    display: flex;
-    align-items: center;
-    text-align: center;
-    justify-content: center;
-  }
-
-  .trightb_item {
-    padding-top: 5px;
+  .addinputInfo {
+    margin-left: 120px !important;
   }
 
-  .span {
-    height: 30px;
-    line-height: 30px;
-    margin-left: 50px;
-    font-size: 15px;
-    font-weight: 400;
-    border: 1px #fff solid;
-    padding: 0px 10px;
-    border-radius: 5px;
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
   }
 
-  ::v-deep .el-collapse-item__header {
-    height: 40px;
-    padding: 10px;
-    font-weight: bold;
-    font-size: 20px;
-    text-align: left;
-    color: #ffffff;
-    background-color: #0294d7;
+  .first_row {
+    border-top: 1px solid #E0E3EB;
   }
 
-  ::v-deep .el-collapse-item__content {
-    padding-bottom: 0;
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
   }
 </style>

yxt-as-ui/src/views/storage/oldPartsRecovery/oldPartsRecoveryInfo.vue

@@ -15,7 +15,9 @@
     <div class="listconadd">
 
       <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
-
+        <div class="title">
+          <div>基础信息</div>
+        </div>
         <el-row class="first_row">
           <el-col :span="12">
             <div class="span-sty">维修工单编号</div>
@@ -49,7 +51,7 @@
             <el-form-item><span class="addinputInfo">{{ formobj.vinNo }}</span></el-form-item>
           </el-col>
           <el-col :span="12">
-          <!-- <div class="span-sty"></div>
+            <!-- <div class="span-sty"></div>
             <el-form-item><span class="addinputInfo">{{ formobj.vehMark }}</span></el-form-item> -->
           </el-col>
 
@@ -69,8 +71,8 @@
           <el-col :span="24">
             <div class="span-sty">旧件照片</div>
             <el-form-item>
-              <el-image class="addinputInfo" style="width: 120px;height: 120px; margin: 10px;" v-for="(item,index) in formobj.photos"
-                :src="item.url" :preview-src-list="[item.url]">
+              <el-image class="addinputInfo" style="width: 120px;height: 120px; margin: 10px;"
+                v-for="(item,index) in formobj.photos" :src="item.url" :preview-src-list="[item.url]">
               </el-image>
             </el-form-item>
           </el-col>
@@ -128,8 +130,8 @@
     }
   }
 </script>
-<style  scoped>
-.span-sty {
+<style scoped>
+  .span-sty {
     width: 130px !important;
   }
 
@@ -142,7 +144,7 @@
     width: calc(100% - 115px);
   }
 
-  .first_row{
+  .first_row {
     border-top: 1px solid #E0E3EB;
   }
 

yxt-as-ui/src/views/storage/outStorage/outStorageAdd.vue

@@ -13,116 +13,71 @@
       <!-- end 详情按钮 -->
     </div>
     <div class="listconadd">
-      <el-form ref="form_obj" :model="formobj" label-position="top" label-width="190px" class="formadd">
-        <div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
-          <div>基础信息</div>
-        </div>
+     <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+       <div class="title">
+         <div>基础信息</div>
+       </div>
         <el-row class="first_row">
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">单据编号</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <span slot="label">{{formobj.billNo}}</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">制单人姓名</span>
-            </el-form-item>
+
+          <el-col :span="12">
+            <div class="span-sty">单据编号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <el-input v-model="formobj.createByName" placeholder="" class="addinputw" style="width:100%" clearable />
-            </el-form-item>
+          <el-col :span="12">
+            <div class="span-sty">制单人姓名</div>
+             <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
           </el-col>
+
         </el-row>
+
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">外部单号</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <span slot="label">{{formobj.sourceBillNo}}</span>
-              <!-- <el-form-item class="trightb_item">
-             <el-select v-model="GiftBagGood.goodsSkuSid" filterable clearable placeholder="请选择" style="width:100%"
-               @change="orderTypeSelect">
-               <el-option v-for="item in orderTypeList" :key="item.sid" :label="item.name" :value="item.sid">
-               </el-option>
-             </el-select> -->
-            </el-form-item>
-          </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">单据日期</span>
-            </el-form-item>
+
+          <el-col :span="12">
+            <div class="span-sty">外部单号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <!-- <span slot="label">{{formobj.createTime}}</span> -->
-              <el-date-picker v-model="formobj.createTime" type="date" style="width:100%" value-format="yyyy-MM-dd"
+          <el-col :span="12">
+            <div class="span-sty">单据日期</div>
+             <el-form-item><el-date-picker v-model="formobj.createTime" type="date" class="addinputInfo" value-format="yyyy-MM-dd"
                 placeholder="选择日期">
               </el-date-picker>
-            </el-form-item>
+              </el-form-item>
           </el-col>
+
         </el-row>
+
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">业务类型</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <!-- <span slot="label">{{formobj.busTypeValue}}</span> -->
-              <el-select v-model="formobj.busTypeValue" filterable clearable placeholder="请选择" style="width:100%"
+
+          <el-col :span="12">
+            <div class="span-sty">业务类型</div>
+            <el-form-item><el-select v-model="formobj.busTypeValue" filterable clearable placeholder="请选择"class="addinputInfo"
                 @change="busTypeSelect">
                 <el-option v-for="item in busTypeList" :key="item.sid" :label="item.name" :value="item.sid">
                 </el-option>
               </el-select>
-
-              <!--   <el-input v-model="formobj.preferentialPrice" placeholder="" class="addinputw" style="width:100%"
-               clearable /> -->
-            </el-form-item>
-          </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">单据状态</span>
-            </el-form-item>
+              </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <span slot="label">{{formobj.billState}}</span>
-              <!--  <el-input v-model="formobj.remarks" placeholder="" class="addinputw"
-               style="width: 100%; padding-bottom: 5px;" type="textarea" :rows="4" clearable /> -->
-            </el-form-item>
+
+          <el-col :span="12">
+            <div class="span-sty">单据状态</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">备注</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="20">
-            <el-form-item class="trightb_item">
-              <!-- <span slot="label">{{formobj.supplierName}}</span> -->
-              <el-input v-model="formobj.remarks" placeholder="" class="addinputw"
-                style="width: 100%; padding-bottom: 5px;" type="textarea" :rows="4" clearable />
+
+          <el-col :span="24">
+            <div class="span-sty">备注</div>
+            <el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputInfo"type="textarea" :rows="4" clearable />
             </el-form-item>
           </el-col>
+
         </el-row>
-        <div class="title"
-          style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
+        <div class="title titleOne">
           <div>商品列表</div>
         </div>
-        <el-table v-loading="listLoading" :data="formobj.detailsList" border style="width: 100%;"
-          :row-style="{height: '40px'}">
+        <el-table v-loading="listLoading" :data="formobj.detailsList" border>
           <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
           <el-table-column align="center" width="100" :render-header="commodityHeader">
             <template slot-scope="scope">
@@ -182,14 +137,14 @@
         submitdisabled: false,
         formobj: {
           "sourceBillNo": "",
-          "createByName": "",
+          "createByName":  window.sessionStorage.getItem('name'),
           "busTypeKey": "",
           "busTypeValue": "",
           "billState": '新建',
-          "createOrgSid": "",
-          "useOrgSid": "",
+          "createOrgSid":  window.sessionStorage.getItem('orgSid'),
+          "useOrgSid": window.sessionStorage.getItem('orgSid'),
           "sid": "",
-          "createBySid": "",
+          "createBySid":  window.sessionStorage.getItem('userSid'),
           "createTime": "",
           "remarks": "",
           "detailsList": [
@@ -482,48 +437,29 @@
     }
   }
 </script>
-<style lang="scss" scoped>
-  // 隐藏上传组件
-
-  ::v-deep .hide {
-    .el-upload--picture-card {
-      display: none !important;
-    }
+<style scoped>
+  .span-sty {
+    width: 130px !important;
   }
 
-  .trightb {
-    display: flex;
-    align-items: center;
-    text-align: center;
-    justify-content: center;
-  }
-
-  .trightb_item {
-    padding-top: 5px;
+  .addinputInfo {
+    margin-left: 120px !important;
   }
 
-  .span {
-    height: 30px;
-    line-height: 30px;
-    margin-left: 50px;
-    font-size: 15px;
-    font-weight: 400;
-    border: 1px #fff solid;
-    padding: 0px 10px;
-    border-radius: 5px;
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
   }
 
-  ::v-deep .el-collapse-item__header {
-    height: 40px;
-    padding: 10px;
-    font-weight: bold;
-    font-size: 20px;
-    text-align: left;
-    color: #ffffff;
-    background-color: #0294d7;
+  .first_row {
+    border-top: 1px solid #E0E3EB;
   }
 
-  ::v-deep .el-collapse-item__content {
-    padding-bottom: 0;
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
   }
 </style>

yxt-as-ui/src/views/storage/outStorage/outStorageInfo.vue

@@ -14,124 +14,69 @@
 
     <div class="listconadd">
 
-      <el-form ref="form_obj" :model="formobj" label-position="top" label-width="190px" class="formadd">
-        <div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
+      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+        <div class="title">
           <div>基础信息</div>
         </div>
         <el-row class="first_row">
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">单据编号</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <span slot="label">{{formobj.billNo}}</span>
-              <!-- <el-input v-model="formobj.name" placeholder="" class="addinputw" style="width:100%" clearable /> -->
-            </el-form-item>
-          </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">制单人姓名</span>
-            </el-form-item>
+
+          <el-col :span="12">
+            <div class="span-sty">单据编号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <span slot="label">{{formobj.createByName}}</span>
-              <!-- <el-input v-model="formobj.preferentialPrice" placeholder="" class="addinputw" style="width:100%"
-                 clearable /> -->
-            </el-form-item>
+          <el-col :span="12">
+            <div class="span-sty">制单人姓名</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
           </el-col>
+
         </el-row>
+
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">外部单号</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <span slot="label">{{formobj.sourceBillNo}}</span>
-              <!-- <el-form-item class="trightb_item">
-               <el-select v-model="GiftBagGood.goodsSkuSid" filterable clearable placeholder="请选择" style="width:100%"
-                 @change="orderTypeSelect">
-                 <el-option v-for="item in orderTypeList" :key="item.sid" :label="item.name" :value="item.sid">
-                 </el-option>
-               </el-select> -->
-            </el-form-item>
-          </el-col>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">单据日期</span>
-            </el-form-item>
+
+          <el-col :span="12">
+            <div class="span-sty">外部单号</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <span slot="label">{{formobj.createTime}}</span>
-              <!-- <el-select v-model="GiftBagGood.goodsSkuSid" filterable clearable placeholder="请选择" style="width:100%"
-                 @change="businessTypeSelect">
-                 <el-option v-for="item in businessTypeList" :key="item.sid" :label="item.name" :value="item.sid">
-                 </el-option>
-               </el-select> -->
+          <el-col :span="12">
+            <div class="span-sty">单据日期</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span>
             </el-form-item>
           </el-col>
+
         </el-row>
+
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">业务类型</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <span slot="label">{{formobj.busTypeValue}}</span>
-              <!--   <el-input v-model="formobj.preferentialPrice" placeholder="" class="addinputw" style="width:100%"
-                 clearable /> -->
-            </el-form-item>
-          </el-col>
 
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">单据状态</span>
-            </el-form-item>
+          <el-col :span="12">
+            <div class="span-sty">业务类型</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.busTypeValue }}</span></el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item class="trightb_item">
-              <span slot="label">{{formobj.billState}}</span>
-              <!--  <el-input v-model="formobj.remarks" placeholder="" class="addinputw"
-                 style="width: 100%; padding-bottom: 5px;" type="textarea" :rows="4" clearable /> -->
+          <el-col :span="12">
+            <div class="span-sty">单据状态</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.billState }}</span>
             </el-form-item>
           </el-col>
+
         </el-row>
 
         <el-row>
-          <el-col :span="4" class="trightb">
-            <el-form-item class="trightb_item">
-              <span slot="label">备注</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="20">
 
-            <el-form-item class="trightb_item">
-              <span slot="label">{{formobj.remarks}}</span>
-              <!-- <el-input v-model="formobj.remarks" placeholder="" class="addinputw"
-                 style="width: 100%; padding-bottom: 5px;" type="textarea" :rows="4" clearable /> -->
-            </el-form-item>
+          <el-col :span="24">
+            <div class="span-sty">备注</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
           </el-col>
 
         </el-row>
-        <div class="title"
-          style="display: flex;align-items: center;justify-content: space-between;height:40px;margin-top: 10px;">
+        <div class="title">
           <div>商品列表</div>
         </div>
-        <el-table v-loading="listLoading" :data="formobj.detailsList" border style="width: 100%;"
-          :row-style="{height: '40px'}">
+        <el-table v-loading="listLoading" :data="formobj.detailsList" border>
           <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
           <el-table-column label="商品名称" prop="goodsSpuName" align="center" />
           <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
           <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
-          <el-table-column label="单位" prop="unit" align="center"  />
-          <el-table-column label="出库数量" prop="outCount" align="center"  />
+          <el-table-column label="单位" prop="unit" align="center" />
+          <el-table-column label="出库数量" prop="outCount" align="center" />
         </el-table>
       </el-form>
 
@@ -142,7 +87,7 @@
 </template>
 
 <script>
-   import req from '@/api/storage/outStorage.js'
+  import req from '@/api/storage/outStorage.js'
 
   export default {
     components: {},
@@ -184,48 +129,29 @@
     }
   }
 </script>
-<style lang="scss" scoped>
-  // 隐藏上传组件
-
-  ::v-deep .hide {
-    .el-upload--picture-card {
-      display: none !important;
-    }
-  }
-
-  .trightb {
-    display: flex;
-    align-items: center;
-    text-align: center;
-    justify-content: center;
-  }
-
-  .trightb_item {
-    padding-top: 5px;
-  }
-
-  .span {
-    height: 30px;
-    line-height: 30px;
-    margin-left: 50px;
-    font-size: 15px;
-    font-weight: 400;
-    border: 1px #fff solid;
-    padding: 0px 10px;
-    border-radius: 5px;
-  }
-
-  ::v-deep .el-collapse-item__header {
-    height: 40px;
-    padding: 10px;
-    font-weight: bold;
-    font-size: 20px;
-    text-align: left;
-    color: #ffffff;
-    background-color: #0294d7;
-  }
-
-  ::v-deep .el-collapse-item__content {
-    padding-bottom: 0;
-  }
+<style  scoped>
+ .span-sty {
+   width: 130px !important;
+ }
+
+ .addinputInfo {
+   margin-left: 120px !important;
+ }
+
+ .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+   margin-left: 120px !important;
+   width: calc(100% - 115px);
+ }
+
+ .first_row {
+   border-top: 1px solid #E0E3EB;
+ }
+
+ .titleOne {
+   padding: 7px;
+   display: flex;
+   flex-direction: row;
+   justify-content: space-between;
+   align-items: center;
+ }
 </style>

yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue

@@ -274,8 +274,8 @@
           "billNo": "",
           "sourceBillSid": "",
           "sourceBillNo": "",
-          "createBySid": "",
-          "createByName": "",
+          "createBySid": window.sessionStorage.getItem('userSid'),
+          "createByName":window.sessionStorage.getItem('name'),
           "createTime": "",
           "busTypeKey": "",
           "busTypeValue": "",
@@ -284,8 +284,8 @@
           "deliveryDate": "",
           "billState": "新建",
           "remarks": "",
-          "useOrgSid": "",
-          "createOrgSid": "",
+          "useOrgSid": window.sessionStorage.getItem('orgSid'),
+          "createOrgSid": window.sessionStorage.getItem('orgSid'),
           "list": [],
           "pcList": []
         },

yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue

@@ -66,48 +66,48 @@
           <div>商品列表</div>
         </div>
 
-        <el-table v-loading="listLoading" :data="formobj.pcList" border
-          <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-          <el-table-column fixed label="操作" wid align="center" width="120">
-            <template slot-scope="scope">
-              <el-button type="primary" size="mini" @click="doGoodsDel(scope.row)">删除</el-button>
-            </template>
-          </el-table-column>
-          <el-table-column label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
-          <el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
-          <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
-          <el-table-column label="单位" prop="unit" align="center" width="120" />
-          <el-table-column label="仓库" align="center" width="180">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.warehouseName" placeholder="请选择" clearable
-                @change="selectWarehouseName(scope.row,$event)">
-                <el-option v-for="(item,i) in warehouseList" :key="i" :label="item.warehouseName" :value="item.sid">
-                </el-option>
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column label="库位" align="center" width="180">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.warehouseRackName" :disabled="scope.row.warehouseName==''" clearable
-                @focus="getWarehouseAreaList(scope.row.warehouseSid)" placeholder="请选择"
-                @change="selectWarehouseAreaCode(scope.row,$event)">
-                <el-option v-for="(item,i) in warehouseRackList" :key="i" :label="item.areaCode" :value="item.sid">
-                </el-option>
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column label="批次号" prop="batchNumber" align="center" width="300" />
-          <el-table-column label="上架数量" align="center" width="180">
-            <template slot-scope="scope">
-              <el-input ref="focusAssumptionInput" v-model="scope.row.actualCount" clearable placeholder=""
-                oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
-            </template>
-          </el-table-column>
-          <el-table-column label="载具编号" align="center" width="180">
-            <template slot-scope="scope">
-              <el-input ref="focusAssumptionInput" v-model="scope.row.packageNo" clearable placeholder="" />
-            </template>
-          </el-table-column>
+        <el-table v-loading="listLoading" :data="formobj.pcList" border <el-table-column fixed width="60" label="序号"
+          type="index" :index="indexMethod" align="center" />
+        <el-table-column fixed label="操作" wid align="center" width="120">
+          <template slot-scope="scope">
+            <el-button type="primary" size="mini" @click="doGoodsDel(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
+        <el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
+        <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
+        <el-table-column label="单位" prop="unit" align="center" width="120" />
+        <el-table-column label="仓库" align="center" width="180">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.warehouseName" placeholder="请选择" clearable
+              @change="selectWarehouseName(scope.row,$event)">
+              <el-option v-for="(item,i) in warehouseList" :key="i" :label="item.warehouseName" :value="item.sid">
+              </el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column label="库位" align="center" width="180">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.warehouseRackName" :disabled="scope.row.warehouseName==''" clearable
+              @focus="getWarehouseAreaList(scope.row.warehouseSid)" placeholder="请选择"
+              @change="selectWarehouseAreaCode(scope.row,$event)">
+              <el-option v-for="(item,i) in warehouseRackList" :key="i" :label="item.areaCode" :value="item.sid">
+              </el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column label="批次号" prop="batchNumber" align="center" width="300" />
+        <el-table-column label="上架数量" align="center" width="180">
+          <template slot-scope="scope">
+            <el-input ref="focusAssumptionInput" v-model="scope.row.actualCount" clearable placeholder=""
+              oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+          </template>
+        </el-table-column>
+        <el-table-column label="载具编号" align="center" width="180">
+          <template slot-scope="scope">
+            <el-input ref="focusAssumptionInput" v-model="scope.row.packageNo" clearable placeholder="" />
+          </template>
+        </el-table-column>
         </el-table>
 
       </el-form>
@@ -130,8 +130,8 @@
         formobj: {
           "sid": "",
           "billNo": "",
-          "createBySid": "",
-          "createByName": "",
+          "createBySid": window.sessionStorage.getItem('userSid'),
+          "createByName": window.sessionStorage.getItem('name'),
           "createTime": "",
           "sourceBillNo": "",
           "sourceBillSid": "",
@@ -269,7 +269,7 @@
         row.warehouseSid = choose[0].sid
 
       },
-      selectWarehouseAreaCode(row,val) {
+      selectWarehouseAreaCode(row, val) {
         console.log("selectWarehouseAreaCode", val);
 
         const choose = this.warehouseRackList.filter((item) => item.sid == val)

yxt-as-ui/src/views/storage/stocktaking/stocktakingAdd.vue

@@ -111,16 +111,16 @@
           "sid": "",
           "remarks": "",
           "billNo": "",
-          "createBySid": "",
+          "createBySid": window.sessionStorage.getItem('userSid'),
+          "createByName":window.sessionStorage.getItem('name'),
           "createDate": "",
-          "createUserSid": "",
-          "createByName": "",
+          "createUserSid": window.sessionStorage.getItem('userSid'),
           "checkType": "",
           "profitAmount": "",
           "lossCount": "",
           "lossAmount": "",
-          "useOrgSid": "",
-          "createOrgSid": "",
+          "useOrgSid": window.sessionStorage.getItem('orgSid'),
+          "createOrgSid": window.sessionStorage.getItem('orgSid'),
           "wmsInventoryCheckbillDetailList": [
 
           ]

yxt-as-ui/src/views/storage/upShelf/upShelfAdd.vue

@@ -129,8 +129,8 @@
         formobj: {
           "sid": "",
           "billNo": "",
-          "createBySid": "",
-          "createByName": "",
+          "createBySid": window.sessionStorage.getItem('userSid'),
+          "createByName": window.sessionStorage.getItem('name'),
           "createTime": "",
           "sourceBillNo": "",
           "sourceBillSid": "",