完善上架单

yxt-as-ui/src/views/goods/goods/goodsAdd.vue

@@ -135,7 +135,7 @@
           <el-col :span="12">
             <div class="span-sty">是否上架</div>
             <el-form-item>
-              <el-radio-group v-model="formobj.isListed" size="small" class="addinputw">
+              <el-radio-group v-model="formobj.isListed" size="small"  style="margin-left: 120px;">
                 <el-radio :label="'1'">上架</el-radio>
                 <el-radio :label="'2'">下架</el-radio>
               </el-radio-group>
@@ -373,7 +373,7 @@
             <el-col :span="8">
               <div class="span-sty">是否原厂</div>
               <el-form-item>
-                <el-radio-group v-model="itemInfo.isOriginalFactory" :disabled="true" size="small" class="addinputw">
+                <el-radio-group v-model="itemInfo.isOriginalFactory" :disabled="true" size="small" style="margin-left: 120px;">
                   <el-radio :label="'1'">是</el-radio>
                   <el-radio :label="'2'">否</el-radio>
                 </el-radio-group>
@@ -387,7 +387,7 @@
             <el-col :span="8">
               <div class="span-sty">是否库存警戒</div>
               <el-form-item>
-                <el-radio-group v-model="itemInfo.isInventoryAlert" :disabled="true" size="small" class="addinputw">
+                <el-radio-group v-model="itemInfo.isInventoryAlert" :disabled="true" size="small" style="margin-left: 120px;">
                   <el-radio :label="'1'">是</el-radio>
                   <el-radio :label="'2'">否</el-radio>
                 </el-radio-group>
@@ -473,7 +473,7 @@
             <el-col :span="8">
               <div class="span-sty">是否积分兑换</div>
               <el-form-item>
-                <el-radio-group v-model="itemInfo.isIntegralExchange" :disabled="true" size="small" class="addinputw">
+                <el-radio-group v-model="itemInfo.isIntegralExchange" :disabled="true" size="small" style="margin-left: 120px;">
                   <el-radio :label="'1'">是</el-radio>
                   <el-radio :label="'2'">否</el-radio>
                 </el-radio-group>
@@ -494,7 +494,7 @@
             <el-col :span="8">
               <div class="span-sty">锁定销售价格</div>
               <el-form-item>
-                <el-radio-group v-model="itemInfo.isLockingSalesPrice" :disabled="true" size="small" class="addinputw">
+                <el-radio-group v-model="itemInfo.isLockingSalesPrice" :disabled="true" size="small"  style="margin-left: 120px;">
                   <el-radio :label="'1'">是</el-radio>
                   <el-radio :label="'2'">否</el-radio>
                 </el-radio-group>
@@ -567,7 +567,7 @@
             <el-col :span="8">
               <div class="span-sty">是否原厂</div>
               <el-form-item>
-                <el-radio-group v-model="itemInfo.isOriginalFactory" size="small" class="addinputw">
+                <el-radio-group v-model="itemInfo.isOriginalFactory" size="small"  style="margin-left: 120px;">
                   <el-radio :label="'1'">是</el-radio>
                   <el-radio :label="'2'">否</el-radio>
                 </el-radio-group>
@@ -581,7 +581,7 @@
             <el-col :span="8">
               <div class="span-sty">是否库存警戒</div>
               <el-form-item>
-                <el-radio-group v-model="itemInfo.isInventoryAlert" size="small" class="addinputw">
+                <el-radio-group v-model="itemInfo.isInventoryAlert" size="small" style="margin-left: 120px;">
                   <el-radio :label="'1'">是</el-radio>
                   <el-radio :label="'2'">否</el-radio>
                 </el-radio-group>
@@ -676,7 +676,7 @@
             <el-col :span="8">
               <div class="span-sty">是否积分兑换</div>
               <el-form-item>
-                <el-radio-group v-model="itemInfo.isIntegralExchange" size="small" class="addinputw">
+                <el-radio-group v-model="itemInfo.isIntegralExchange" size="small"  style="margin-left: 120px;">
                   <el-radio :label="'1'">是</el-radio>
                   <el-radio :label="'2'">否</el-radio>
                 </el-radio-group>
@@ -698,7 +698,7 @@
             <el-col :span="8">
               <div class="span-sty">锁定销售价格</div>
               <el-form-item>
-                <el-radio-group v-model="itemInfo.isLockingSalesPrice" size="small" class="addinputw">
+                <el-radio-group v-model="itemInfo.isLockingSalesPrice" size="small"  style="margin-left: 120px;">
                   <el-radio :label="'1'">是</el-radio>
                   <el-radio :label="'2'">否</el-radio>
                 </el-radio-group>

yxt-as-ui/src/views/goods/goods/goodsAdd2.vue

@@ -117,8 +117,8 @@
           <el-col :span="6">
             <div class="span-sty">原厂标志</div>
             <el-form-item>
-              <el-radio-group v-model="formobj.isOriginalFactory" size="small" class="addinputw"
-                @change="selectIsOriginalFactory">
+              <el-radio-group v-model="formobj.isOriginalFactory" size="medium"
+                style="margin-left: 120px;" @change="selectIsOriginalFactory">
                 <el-radio :label="'1'">是</el-radio>
                 <el-radio :label="'2'">否</el-radio>
               </el-radio-group>
@@ -170,7 +170,7 @@
           <el-col :span="6">
             <div class="span-sty">锁定销售定价</div>
             <el-form-item>
-              <el-radio-group v-model="formobj.isLockingSalesPrice" size="small" class="addinputw"
+              <el-radio-group v-model="formobj.isLockingSalesPrice" size="small"  style="margin-left: 120px;"
                 @change="selectIsLockingSalesPrice">
                 <el-radio :label="'1'">是</el-radio>
                 <el-radio :label="'2'">否</el-radio>
@@ -343,11 +343,11 @@
 
       },
       initData() {
-      var parpams = {
-        orgPath: window.sessionStorage.getItem('defaultOrgPath'),
-        userSid: window.sessionStorage.getItem('userSid'),
-        menuUrl: this.$route.path
-      }
+        var parpams = {
+          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+          userSid: window.sessionStorage.getItem('userSid'),
+          menuUrl: this.$route.path
+        }
         req2.getAllBrand(parpams).then(resp => {
           this.brandList = resp.data
         })
@@ -443,11 +443,11 @@
             if (resp.success) {
               this.formobj = resp.data
 
-              for (var i = 0; i <  resp.data.picPath.length; i++) {
-               var item =  resp.data.picPath[i]
-               this.imgList.push({
-                 url:item.url
-               })
+              for (var i = 0; i < resp.data.picPath.length; i++) {
+                var item = resp.data.picPath[i]
+                this.imgList.push({
+                  url: item.url
+                })
               }
             }
           })
@@ -516,4 +516,10 @@
     justify-content: space-between;
     align-items: center;
   }
+
+  .el-radio /deep/ .el-radio__label {
+
+    font-size: 14px !important;
+
+  }
 </style>

yxt-as-ui/src/views/goods/goods/goodsInfo.vue

@@ -120,7 +120,7 @@
           <el-col :span="12">
             <div class="span-sty">是否上架</div>
             <el-form-item>
-              <el-radio-group v-model="formobj.isListed" :disabled="true" size="small" class="addinputw">
+              <el-radio-group v-model="formobj.isListed" :disabled="true" size="small" style="margin-left: 120px;">
                 <el-radio :label="'1'">上架</el-radio>
                 <el-radio :label="'2'">下架</el-radio>
               </el-radio-group>
@@ -272,7 +272,7 @@
             <el-col :span="8">
               <div class="span-sty">是否原厂</div>
               <el-form-item>
-                <el-radio-group v-model="itemInfo.isOriginalFactory" :disabled="true" size="small" class="addinputw">
+                <el-radio-group v-model="itemInfo.isOriginalFactory" :disabled="true" size="small"  style="margin-left: 120px;">
                   <el-radio :label="'1'">是</el-radio>
                   <el-radio :label="'2'">否</el-radio>
                 </el-radio-group>
@@ -286,7 +286,7 @@
             <el-col :span="8">
               <div class="span-sty">是否库存警戒</div>
               <el-form-item>
-                <el-radio-group v-model="itemInfo.isInventoryAlert" :disabled="true" size="small" class="addinputw">
+                <el-radio-group v-model="itemInfo.isInventoryAlert" :disabled="true" size="small" style="margin-left: 120px;">
                   <el-radio :label="'1'">是</el-radio>
                   <el-radio :label="'2'">否</el-radio>
                 </el-radio-group>
@@ -372,7 +372,7 @@
             <el-col :span="8">
               <div class="span-sty">是否积分兑换</div>
               <el-form-item>
-                <el-radio-group v-model="itemInfo.isIntegralExchange" :disabled="true" size="small" class="addinputw">
+                <el-radio-group v-model="itemInfo.isIntegralExchange" :disabled="true" size="small"  style="margin-left: 120px;">
                   <el-radio :label="'1'">是</el-radio>
                   <el-radio :label="'2'">否</el-radio>
                 </el-radio-group>
@@ -393,7 +393,7 @@
             <el-col :span="8">
               <div class="span-sty">锁定销售价格</div>
               <el-form-item>
-                <el-radio-group v-model="itemInfo.isLockingSalesPrice" :disabled="true" size="small" class="addinputw">
+                <el-radio-group v-model="itemInfo.isLockingSalesPrice" :disabled="true" size="small" style="margin-left: 120px;">
                   <el-radio :label="'1'">是</el-radio>
                   <el-radio :label="'2'">否</el-radio>
                 </el-radio-group>

yxt-as-ui/src/views/goods/goods/goodsInfo2.vue

@@ -100,7 +100,7 @@
         <el-col :span="6">
           <div class="span-sty">原厂标志</div>
           <el-form-item>
-            <el-radio-group v-model="formobj.isOriginalFactory" :disabled="true" size="small" class="addinputw">
+            <el-radio-group v-model="formobj.isOriginalFactory" :disabled="true" size="small"  style="margin-left: 120px;">
               <el-radio :label="'1'">是</el-radio>
               <el-radio :label="'2'">否</el-radio>
             </el-radio-group>
@@ -150,7 +150,7 @@
         <el-col :span="6">
           <div class="span-sty">锁定销售定价</div>
           <el-form-item>
-            <el-radio-group v-model="formobj.isLockingSalesPrice" :disabled="true" size="small" class="addinputw">
+            <el-radio-group v-model="formobj.isLockingSalesPrice" :disabled="true" size="small"  style="margin-left: 120px;">
               <el-radio :label="'1'">是</el-radio>
               <el-radio :label="'2'">否</el-radio>
             </el-radio-group>

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

@@ -25,7 +25,7 @@
               </el-form-item>
               <el-form-item label="单据状态">
                 <el-select v-model="queryParams.params.billState" placeholder="请选择">
-                  <el-option v-for="(item,i) in billStateList" :key="i" :label="item.name" :value="item.sid">
+                  <el-option v-for="(item,i) in billStateList" :key="item.sid" :label="item.name" :value="item.name">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -139,7 +139,15 @@
           size: 10,
           total: 0,
           params: {
-            name: ''
+            name: '',
+            billNo: "",
+            sourceBillNo: "",
+            createTimestart: '',
+            createTimeEnd: '',
+            billstate: '',
+            menuUrl: '',
+            orgPath: '',
+            usersid: ""
           }
         },
         sids: [],
@@ -149,7 +157,7 @@
             sid: "0"
           },
           {
-            name: "完成",
+            name: "已完成",
             sid: "1"
           }
         ],
@@ -251,6 +259,9 @@
       },
       loadList() {
         this.tableLoading = true
+        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        this.queryParams.params.menuUrl = this.$route.path
         req.listPage(this.queryParams).then((resp) => {
           this.tableLoading = false
           if (resp.success) {
@@ -283,7 +294,15 @@
           size: 10,
           total: 0,
           params: {
-            name: ''
+           name: '',
+           billNo: "",
+           sourceBillNo: "",
+           createTimestart: '',
+           createTimeEnd: '',
+           billstate: '',
+           menuUrl: '',
+           orgPath: '',
+           usersid: ""
           }
         }
         this.loadList()

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

@@ -48,7 +48,7 @@
 
           <el-col :span="8">
             <div class="span-sty">上架人</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.upShelfName }}</span></el-form-item>
           </el-col>
 
 
@@ -69,7 +69,7 @@
 
         <el-table v-loading="listLoading" :data="formobj.list" border>
           <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80" />
-          <el-table-column fixed label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
+          <el-table-column fixed label="商品名称" prop="goodsSpuName" align="center" width="200" />
           <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
           <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
           <el-table-column label="单位" prop="unit" align="center" />
@@ -78,7 +78,7 @@
           <el-table-column label="库位" prop="warehouseRackCode" align="center" /> -->
           <el-table-column label="需上架数量" prop="count" align="center" />
           <el-table-column label="已上架数量" prop="actualCount" align="center" />
-          <el-table-column label="未上架数量" prop="actualCount" align="center" />
+          <el-table-column label="未上架数量" prop="noShelfCount" align="center" />
           <el-table-column label="载具编号" prop="packageNo" align="center" />
         </el-table>