Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/api/storage/upShelf.js

@@ -15,9 +15,8 @@ export default {
   // 初始化
   init: function(data) {
     return request({
-      url: '/wms/apiadmin/WmsShelfBill/details',
+      url: '/wms/apiadmin/WmsShelfBill/details?sid='+data,
-      method: 'get',
+      method: 'get'
-      data:data
     });
   },
 

yxt-as-ui/src/views/goods/category/categoryAdd.vue

@@ -208,6 +208,8 @@
         console.log('>>>>>>>>>initData')
        var parpams = {
          orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+         userSid: window.sessionStorage.getItem('userSid'),
+         menuUrl: this.$route.path
        }
 
         req.getAllType(parpams).then(resp => {

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

@@ -807,8 +807,9 @@
 
         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
         })

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

@@ -16,9 +16,9 @@
     <div class="listconadd">
 
       <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-        <div class="title">
+        <!-- <div class="title">
           <div>基础信息</div>
-        </div>
+        </div> -->
         <el-row class="first_row">
 
           <el-col :span="6">
@@ -345,6 +345,8 @@
       initData() {
       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
@@ -423,6 +425,7 @@
           "agencyPrice": "",
           "picPath": []
         }
+        this.imgList = []
         this.$emit('doback')
       },
       showAdd() {
@@ -439,6 +442,13 @@
           .then(resp => {
             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
+               })
+              }
             }
           })
           .catch(e => {

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

@@ -15,9 +15,9 @@
   <div class="listconadd">
 
     <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
-      <div class="title">
+     <!-- <div class="title">
         <div>基础信息</div>
-      </div>
+      </div> -->
       <el-row class="first_row">
 
         <el-col :span="6">
@@ -41,7 +41,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <div class="span-sty">商品拼音缩写</div>
+          <div class="span-sty">拼音缩写</div>
           <el-form-item>
             <span class="addinputInfo">{{formobj.goodsPY}}</span>
           </el-form-item>
@@ -52,7 +52,7 @@
       <el-row>
 
         <el-col :span="6">
-          <div class="span-sty">商品单位</div>
+          <div class="span-sty">计量单位</div>
           <el-form-item>
             <span class="addinputInfo">{{formobj.goodsUnitName}}</span>
           </el-form-item>
@@ -84,14 +84,14 @@
       <el-row>
 
         <el-col :span="6">
-          <div class="span-sty">商品品牌</div>
+          <div class="span-sty">品牌</div>
           <el-form-item>
             <span class="addinputInfo">{{formobj.brandName}}</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.manufacturerName}}</span>
           </el-form-item>
@@ -112,16 +112,16 @@
       <el-row>
 
         <el-col :span="6">
-          <div class="span-sty">商品排序</div>
+          <div class="span-sty">库存上限</div>
           <el-form-item>
-            <span class="addinputInfo">{{formobj.sortNo}}</span>
+            <span class="addinputInfo">{{formobj.inventoryAlertUpperLimit}}</span>
           </el-form-item>
         </el-col>
 
         <el-col :span="18">
-          <div class="span-sty">商品备注</div>
+          <div class="span-sty">库存下限</div>
           <el-form-item>
-            <span class="addinputInfo">{{formobj.skuRemarks}}</span>
+            <span class="addinputInfo">{{formobj.inventoryAlertLowerLimit}}</span>
           </el-form-item>
         </el-col>
 
@@ -129,17 +129,17 @@
 
       <el-row>
 
-        <el-col :span="16">
+   <el-col :span="6">
-          <div class="span-sty">库存上限</div>
+          <div class="span-sty">排序</div>
           <el-form-item>
-            <span class="addinputInfo">{{formobj.inventoryAlertUpperLimit}}</span>
+            <span class="addinputInfo">{{formobj.sortNo}}</span>
           </el-form-item>
         </el-col>
 
         <el-col :span="18">
-          <div class="span-sty">库存下限</div>
+          <div class="span-sty">备注</div>
           <el-form-item>
-            <span class="addinputInfo">{{formobj.inventoryAlertLowerLimit}}</span>
+            <span class="addinputInfo">{{formobj.skuRemarks}}</span>
           </el-form-item>
         </el-col>
 

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

@@ -27,7 +27,8 @@
               <el-form-item label="商品类别">
                 <el-select v-model="queryParams.params.goodsTypeName" placeholder="请选择" class="addinputw addinputInfo"
                   @change="selectCateChange">
-                  <el-option v-for="item in goodsTypeList" :key="item.sid" :label="item.goodsTypeName" :value="item.sid" />
+                  <el-option v-for="item in goodsTypeList" :key="item.sid" :label="item.goodsTypeName"
+                    :value="item.sid" />
                 </el-select>
               </el-form-item>
               <el-form-item label="品牌">
@@ -39,7 +40,8 @@
               <el-form-item label="厂家">
                 <el-select v-model="queryParams.params.manufacturerName" placeholder="请选择"
                   class="addinputw addinputInfo" @change="selectfacturerChange">
-                  <el-option v-for="item in facturerList" :key="item.sid" :label="item.manufacturerName" :value="item.sid" />
+                  <el-option v-for="item in facturerList" :key="item.sid" :label="item.manufacturerName"
+                    :value="item.sid" />
                 </el-select>
               </el-form-item>
 
@@ -230,6 +232,8 @@
       initData() {
         var parpams = {
           orgPath: window.sessionStorage.getItem('defaultOrgPath'),
+          userSid: window.sessionStorage.getItem('userSid'),
+          menuUrl: this.$route.path
         }
         // 品牌
         req2.getAllBrand(parpams).then(resp => {

yxt-as-ui/src/views/goods/unit/unitAdd.vue

@@ -30,7 +30,7 @@
           <el-col :span="16">
             <div class="span-sty">备注</div>
             <el-form-item>
-              <el-input v-model="formobj.remarks" placeholder="" class="item_input" clearable />
+              <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" clearable />
             </el-form-item>
           </el-col>
         </el-row>

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

@@ -20,7 +20,7 @@
                   format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
                 </el-date-picker>
               </el-form-item>
-              <el-form-item label="外部单号">
+              <el-form-item label="来源单号">
                 <el-input v-model="queryParams.params.sourceBillNo" placeholder="" clearable />
               </el-form-item>
               <el-form-item label="业务类型">
@@ -79,7 +79,7 @@
             <el-table-column prop="billNo" label="单据编号" align="center" width="220" />
             <el-table-column prop="createTime" label="单据日期" align="center" width="150" />
             <el-table-column prop="createByName" label="制单人" align="center" width="150" />
-            <el-table-column prop="sourceBillNo" label="外部单号" align="center" width="180" />
+            <el-table-column prop="sourceBillNo" label="来源单号" align="center" width="180" />
             <el-table-column prop="busTypeValue" label="业务类型" align="center" width="150" />
             <el-table-column prop="supplierName" label="供应商" align="center" width="150" />
             <el-table-column prop="contact" label="联系人" align="center" width="150" />

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

@@ -37,7 +37,7 @@
         <el-row>
 
           <el-col :span="8">
-            <div class="span-sty">外部单号</div>
+            <div class="span-sty">来源单号</div>
             <el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
           </el-col>
           <el-col :span="8">

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

@@ -75,7 +75,7 @@
             <el-table-column prop="billNo" width="220" label="单据编号" align="center" />
             <el-table-column prop="createTime" label="单据日期" align="center" />
             <el-table-column prop="createByName" label="制单人" align="center" />
-            <el-table-column prop="sourceBillNo" label="来源单号" align="center" />
+            <el-table-column prop="sourceBillNo" label="来源单号" width="220"align="center" />
             <el-table-column prop="busTypeValue" label="业务类型" align="center" />
             <el-table-column prop="supplierName" label="供应商" align="center" />
             <el-table-column prop="deliveryDate" label="到货日期" align="center" />
@@ -350,10 +350,10 @@
           return
         }
 
-        if (this.selectionList[0].billState == '已完成') {
+        if (this.selectionList[0].billState == '新建') {
           this.$message({
             type: 'warning',
-            message: "此记录已完成,不可操作。",
+            message: "此记录未完成,不可操作。",
             showClose: true
           })
           return

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

@@ -108,7 +108,7 @@
           <el-table-column label="批次号" prop="batchNumber" align="center" width="300" /> -->
           <el-table-column label="需上架数量" align="center">
             <template slot-scope="scope">
-              <el-input ref="focusAssumptionInput" v-model="scope.row.actualCount" clearable placeholder=""
+              <el-input ref="focusAssumptionInput" v-model="scope.row.count" clearable placeholder=""
                 oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
             </template>
           </el-table-column>
@@ -134,7 +134,8 @@
     getCurrentDate
   } from '@/utils/index.js'
   import {
-    selAllByOrgSidPath
+    selAllByOrgSidPath,
+    getOrgSidByPath
   } from '@/api/Common/dictcommons'
 
   export default {
@@ -158,7 +159,9 @@
           "list": [
 
           ],
-          "remarks": ""
+          "remarks": "",
+          'createOrgSid': "",
+          'useOrgSid': ""
         },
         hideUploadBtn: false,
         busTypeList: [{
@@ -193,6 +196,16 @@
 
     },
     methods: {
+      getOrgPathSid() {
+        getOrgSidByPath({
+          orgPath: window.sessionStorage.getItem('defaultOrgPath')
+        }).then((res) => {
+          if (res.success) {
+            this.formobj.createOrgSid = res.data
+            this.formobj.useOrgSid = res.data
+          }
+        })
+      },
       doGoodsDel(sid) {
         console.log("doGoodsDel》》》》", sid)
 
@@ -256,7 +269,9 @@
           "list": [
 
           ],
-          "remarks": ""
+          "remarks": "",
+          'createOrgSid': "",
+          'useOrgSid': ""
         }
         this.$emit('doback')
       },
@@ -267,6 +282,7 @@
       showEdit(row) {
         this.getWarehouseList()
         this.getAllOrgper()
+        this.getOrgPathSid()
         var params = {
           sid: row.sid,
           orgPath: window.sessionStorage.getItem('defaultOrgPath'),

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

@@ -114,7 +114,7 @@
           <el-table-column label="批次号" prop="batchNumber" align="center" width="300" /> -->
           <el-table-column label="需要上架数量" align="center" width="120">
             <template slot-scope="scope">
-              <el-input ref="focusAssumptionInput" v-model="scope.row.actualCount" clearable placeholder=""
+              <el-input ref="focusAssumptionInput" v-model="scope.row.count" clearable placeholder=""
                 oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
             </template>
           </el-table-column>

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

@@ -120,7 +120,7 @@
         var params = {
           sid: row.sid
         }
-        req.init(params)
+        req.init(row.sid)
           .then(resp => {
             if (resp.success) {
               this.formobj = resp.data

yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue

@@ -51,7 +51,7 @@
         <el-row >
           <el-col :span="8">
 
-            <div class="span-sty"><span class="must">*</span> 库区容量</div>
+            <div class="span-sty">库区容量</div>
             <el-form-item>
               <el-input v-model="formobj.volume" placeholder="库区容量" class="addinputw addinputInfo" clearable
                 oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
@@ -59,7 +59,7 @@
           </el-col>
 
           <el-col :span="8">
-            <div class="span-sty"><span class="must">*</span> 计量单位</div>
+            <div class="span-sty">计量单位</div>
             <el-form-item>
               <el-input v-model="formobj.unit" placeholder="计量单位" class="addinputw addinputInfo" clearable />
             </el-form-item>