完善基础信息

src/api/goods/goods.js

@@ -44,6 +44,14 @@ export default {
     });
   },
 
+  // 商品规格 修改是否可用状态
+  updateIsEnable2: function(sid, isEnable) {
+    return request({
+      url: '/wms/apiadmin/base/basegoodsspu/updateIsEnablebySku/' + sid + "/" + isEnable
+    });
+  },
+
+
 
   // 商品-- 删除
   deleteBySids: function(data) {

src/views/baseInfo/supplier/supplier/supplierAdd.vue

@@ -127,8 +127,8 @@
                   placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty"><span class="icon">*</span>开票类型</div>
+              <div class="span-sty">开票类型</div>
-              <el-form-item prop="billingTypeValue">
+              <el-form-item>
                 <el-select v-model="formobj.billingTypeValue" class="addinputInfo" filterable placeholder=""
                   @change="billingTypeChange">
                   <el-option v-for="item in billingType_list" :key="item.dictKey" :label="item.dictValue"
@@ -137,9 +137,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty"><span class="icon">*</span>税率</div>
+              <div class="span-sty">税率</div>
-              <el-form-item prop="taxRate"><el-input v-model="formobj.taxRate" class="addinputInfo addinputw" clearable
+              <el-form-item><el-input v-model="formobj.taxRate" class="addinputInfo addinputw" clearable placeholder=""
-                  placeholder="" @keyup.native="formobj.taxRate = getNumber(formobj.taxRate, 2)" /></el-form-item>
+                  @keyup.native="formobj.taxRate = getNumber(formobj.taxRate, 2)" /></el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -274,23 +274,13 @@
             message: '开票公司名称不能为空',
             trigger: 'blur'
           }],
-          billingTypeValue: [{
-            required: true,
-            message: '开票类型不能为空',
-            trigger: 'change'
-          }],
-          taxRate: [{
-            required: true,
-            message: '税率不能为空',
-            trigger: 'blur'
-          }]
         }
       }
     },
     methods: {
       init() {
         typeValues({
-          type: 'accountType'
+          type: 'billingType'
         }).then((res) => {
           if (res.success) {
             this.billingType_list = res.data

src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue

@@ -17,14 +17,14 @@
 
       <el-card class="box-card">
         <div class="item">
-          <span class="item_text">选择所属仓库：</span>
+          <span class="item_text"><span class="must">*</span> 选择所属仓库：</span>
           <el-select v-model="formobj.warehouseName" placeholder="请选择所属仓库" class="item_input"
             @change="selectWarehouseChange">
             <el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName" :value="item.sid" />
           </el-select>
         </div>
         <div class="item">
-          <span class="item_text">选择所属库区：</span>
+          <span class="item_text"><span class="must">*</span> 选择所属库区：</span>
           <el-select v-model="formobj.locationName" placeholder="请选择所属库区" class="item_input"
             @change="selectWarehouseAreaChange">
             <el-option v-for="item in warehouseAreaList" :key="item.sid" :label="item.areaName" :value="item.sid" />
@@ -35,7 +35,7 @@
           <el-input v-model="formobj.rackName" placeholder="库位名称" class="item_input" clearable />
         </div>
         <div class="item">
-          <span class="item_text">库位编码：</span>
+          <span class="item_text"><span class="must">*</span> 库位编码：</span>
           <el-input v-model="formobj.rackCode" placeholder="库位编码" class="item_input" clearable
             oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" />
         </div>
@@ -98,7 +98,7 @@
         if (this.formobj.warehouseName == '' || this.formobj.warehouseSid == '') {
           this.$message({
             showClose: true,
-            type: 'error',
+            type: 'warning',
             message: '所属仓库不能为空'
           })
           return
@@ -107,12 +107,21 @@
         if (this.formobj.locationName == '' || this.formobj.locationSid == '') {
           this.$message({
             showClose: true,
-            type: 'error',
+            type: 'warning',
             message: '所属仓区不能为空'
           })
           return
         }
 
+        if (this.formobj.rackCode == '') {
+          this.$message({
+            showClose: true,
+            type: 'warning',
+            message: '库位编码不能为空'
+          })
+          return
+        }
+
         req.saveGoodsShelves(this.formobj)
           .then(resp => {
             if (resp.success) {
@@ -215,6 +224,10 @@
         flex: 0.8;
         font-size: 18px;
         text-align: right;
+
+        .must {
+          color: #f00;
+        }
       }
 
       .item_input {

src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue

@@ -17,11 +17,11 @@
 
       <el-card class="box-card">
         <div class="item">
-          <span class="item_text">仓库名称：</span>
+          <span class="item_text"><span class="must">*</span> 仓库名称：</span>
           <el-input v-model="formobj.warehouseName" placeholder="仓库名称" class="item_input" clearable />
         </div>
         <div class="item">
-          <span class="item_text">仓库编码：</span>
+          <span class="item_text"><span class="must">*</span> 仓库编码：</span>
           <el-input v-model="formobj.warehouseCode" placeholder="仓库编码" class="item_input" clearable
             oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" />
         </div>
@@ -56,20 +56,21 @@
           <el-input v-model="formobj.latitude" placeholder="仓库纬度" class="item_input" clearable />
         </div>
         <div class="item">
-          <span class="item_text">具体地址：</span>
+          <span class="item_text"><span class="must">*</span> 具体地址：</span>
           <el-input v-model="formobj.address" placeholder="具体地址" class="item_input" clearable />
         </div>
         <div class="item">
-          <span class="item_text">使用状态：</span>
+          <span class="item_text"><span class="must">*</span> 使用状态：</span>
           <el-radio-group v-model="formobj.usageStatus" size="small" @change="changeTheme" class="item_input">
-            <el-radio :label="1">正常</el-radio>
+            <el-radio :label="'1'">正常</el-radio>
-            <el-radio :label="0">停用</el-radio>
+            <el-radio :label="'0'">停用</el-radio>
           </el-radio-group>
           <!-- <el-input v-model="formobj.usageStatus" placeholder="仓库排序" class="item_input" clearable /> -->
         </div>
         <div class="item">
-          <span class="item_text">仓库排序：</span>
+          <span class="item_text"><span class="must">*</span> 仓库排序：</span>
-          <el-input v-model="formobj.sortNo" placeholder="仓库排序" class="item_input" clearable />
+          <el-input v-model="formobj.sortNo" placeholder="仓库排序" class="item_input" clearable
+            oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
         </div>
         <div class="item">
           <span class="item_text">仓库备注：</span>
@@ -99,7 +100,7 @@
           manager: '',
           longitude: '',
           latitude: '',
-          usageStatus: "",
+          usageStatus: "1",
           address: '',
           squareMeter: '',
           sortNo: '',
@@ -123,7 +124,7 @@
         if (this.formobj.warehouseName == '') {
           this.$message({
             showClose: true,
-            type: 'error',
+            type: 'warning',
             message: '仓库名称不能为空'
           })
           return
@@ -132,12 +133,39 @@
         if (this.formobj.warehouseCode == '') {
           this.$message({
             showClose: true,
-            type: 'error',
+            type: 'warning',
             message: '仓库编码不能为空'
           })
           return
         }
 
+        if (this.formobj.address == '') {
+          this.$message({
+            showClose: true,
+            type: 'warning',
+            message: '具体地址不能为空'
+          })
+          return
+        }
+
+        if (this.formobj.usageStatus == '') {
+          this.$message({
+            showClose: true,
+            type: 'warning',
+            message: '使用状态不能为空'
+          })
+          return
+        }
+
+        if (this.formobj.sortNo == '') {
+          this.$message({
+            showClose: true,
+            type: 'warning',
+            message: '排序不能为空'
+          })
+          return
+        }
+
 
         req.saveWarehouse(this.formobj)
           .then(resp => {
@@ -166,7 +194,7 @@
           manager: '',
           longitude: '',
           latitude: '',
-          usageStatus: "",
+          usageStatus: "1",
           address: '',
           squareMeter: '',
           sortNo: '',
@@ -222,6 +250,10 @@
         flex: 0.8;
         font-size: 18px;
         text-align: right;
+
+        .must {
+          color: #f00;
+        }
       }
 
       .item_input {

src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue

@@ -17,18 +17,18 @@
 
       <el-card class="box-card">
         <div class="item">
-          <span class="item_text">选择所属仓库：</span>
+          <span class="item_text"><span class="must">*</span> 选择所属仓库：</span>
           <el-select v-model="formobj.warehouseName" placeholder="请选择所属仓库" class="item_input"
             @change="selectWarehouseChange">
             <el-option v-for="item in warehouseList" :key="item.sid" :label="item.warehouseName" :value="item.sid" />
           </el-select>
         </div>
         <div class="item">
-          <span class="item_text">库区名称：</span>
+          <span class="item_text"><span class="must">*</span> 库区名称：</span>
           <el-input v-model="formobj.areaName" placeholder="库区名称" class="item_input" clearable />
         </div>
         <div class="item">
-          <span class="item_text">库区编码：</span>
+          <span class="item_text"><span class="must">*</span> 库区编码：</span>
           <el-input v-model="formobj.areaCode" placeholder="库区编码" class="item_input" clearable
             oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" />
         </div>
@@ -42,7 +42,7 @@
           <el-input v-model="formobj.unit" placeholder="计量单位" class="item_input" clearable />
         </div>
         <div class="item">
-          <span class="item_text">库区类型：</span>
+          <span class="item_text"><span class="must">*</span> 库区类型：</span>
           <el-select v-model="formobj.areaTypeName" placeholder="请选择库区类型" class="item_input"
             @change="selectWarehouseTypeValueChange">
             <el-option v-for="item in  warehouseTypeList" :key="item.sid" :label="item.warehouseAreaTypeName"
@@ -114,7 +114,7 @@
         if (this.formobj.warehouseName == '' || this.formobj.warehouseSid == '') {
           this.$message({
             showClose: true,
-            type: 'error',
+            type: 'warning',
             message: '所属仓库不能为空'
           })
           return
@@ -123,7 +123,7 @@
         if (this.formobj.areaName == '') {
           this.$message({
             showClose: true,
-            type: 'error',
+            type: 'warning',
             message: '仓区名称不能为空'
           })
           return
@@ -132,11 +132,21 @@
         if (this.formobj.areaCode == '') {
           this.$message({
             showClose: true,
-            type: 'error',
+            type: 'warning',
             message: '库区编码不能为空'
           })
           return
         }
+
+        if (this.formobj.areaTypeName == '' || this.formobj.areaTypeSid == '') {
+          this.$message({
+            showClose: true,
+            type: 'warning',
+            message: '库区类型不能为空'
+          })
+          return
+        }
+
         req.saveWarehousearea(this.formobj)
           .then(resp => {
             if (resp.success) {
@@ -230,6 +240,10 @@
         flex: 0.8;
         font-size: 18px;
         text-align: right;
+
+        .must {
+          color: #f00;
+        }
       }
 
       .item_input {

src/views/baseInfo/warehouses/warehouseAreaType/warehouseAreaTypeAdd.vue

@@ -18,7 +18,7 @@
       <el-card class="box-card">
 
         <div class="item">
-          <span class="item_text">库区类型名称：</span>
+          <span class="item_text"><span class="must">*</span> 库区类型名称：</span>
           <el-input v-model="formobj.warehouseAreaTypeName" placeholder="库区类型名称" class="item_input" clearable />
         </div>
         <div class="item">
@@ -55,6 +55,16 @@
     methods: {
       saveOrUpdate() {
         console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+
+        if (this.formobj.warehouseAreaTypeName == '') {
+          this.$message({
+            showClose: true,
+            type: 'warning',
+            message: '库区类型名称不能为空'
+          })
+          return
+        }
+
         req.saveWarehousearea(this.formobj)
           .then(resp => {
             if (resp.success) {
@@ -125,6 +135,10 @@
         flex: 0.8;
         font-size: 18px;
         text-align: right;
+
+        .must {
+          color: #f00;
+        }
       }
 
       .item_input {

src/views/goods/goods/goodsAdd.vue

@@ -266,9 +266,10 @@
         <el-table v-loading="listLoading" :data="formobj.baseGoodsSkus" border>
           <!-- <el-table-column type="selection" align="center" width="50"/> -->
           <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
-          <el-table-column label="操作" wid align="center" width="120">
+          <el-table-column label="操作" wid align="center" width="150">
             <template slot-scope="scope">
               <el-button type="primary" size="mini" @click="editGoodsSku(scope.row)">编辑</el-button>
+              <el-button type="primary" size="mini" @click="delGoodsSku(scope.row)">删除</el-button>
             </template>
           </el-table-column>
           <el-table-column label="是否可用" align="center" width="200">
@@ -715,15 +716,15 @@
             </el-col>
 
 
-            <el-col :span="8">
+            <!--        <el-col :span="8">
               <div class="span-sty">排序</div>
               <el-form-item>
                 <el-input v-model="itemInfo.sortNo" placeholder="排序" clearable class="addinputw addinputInfo"
                   oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
               </el-form-item>
-            </el-col>
+            </el-col> -->
 
-            <el-col :span="8">
+            <el-col :span="16">
               <div class="span-sty">备注</div>
               <el-form-item>
                 <el-input v-model="itemInfo.remarks" placeholder="备注" clearable class="addinputw addinputInfo" />
@@ -993,6 +994,27 @@
         this.orderInfo = goodsSku
         this.dialogVisible3 = true
       },
+      delGoodsSku(row) {
+        console.log('>>>>>>>>>delGoodsSku', row)
+        var index = this.formobj.baseGoodsSkus.findIndex((item) => item == row)
+        this.formobj.baseGoodsSkus.splice(index, 1)
+      },
+      enableChange(sid, state) {
+        console.log('sid', sid)
+        console.log('state', state)
+        req.updateIsEnable2(sid, state).then((resp) => {
+          if (resp.success) {
+            this.$message({
+              type: 'success',
+              message: '状态已更新',
+              showClose: true
+            })
+          } else { // 根据resp.code进行异常情况处理
+          }
+        }).catch(e => {
+          console.log(e)
+        })
+      },
 
       showGoodsSkuDttail(goodsSkuDto) {
         console.log('>>>>>>>>>showGoodsSkuDttail', goodsSkuDto)

src/views/system/menuManage/menuManage.vue

@@ -92,7 +92,8 @@
             <td>
               <!-- <el-input v-model="form.pname" :disabled="true" style="width:300px" /> -->
 
-              <el-select v-model="form.pname" placeholder="请选择" style="width:300px">
+              <el-select v-model="form.pname" placeholder="请选择" style="width:300px"
+                :disabled="form.pname!=''&&form.psid!=''">
                 <el-option hidden :key="form.psid" :label="form.pname" :value="form.pname"></el-option>
                 <el-tree :data="treedata" ref="Tree" show-checkbox accordion node-key="sid"
                   :default-checked-keys="checkedId" :default-expand-all='true' :check-strictly='true'
@@ -209,7 +210,8 @@
               :props="defaultProps" @check-change="checkchange">
             </el-tree> -->
 
-            <el-select v-model="form.pname" placeholder="请选择" style="width:300px">
+            <el-select v-model="form.pname" placeholder="请选择" style="width:300px"
+              :disabled="form.pname!=''&&form.psid!=''">
               <el-option hidden :key="form.psid" :label="form.pname" :value="form.pname"></el-option>
               <el-tree :data="treedata" ref="Tree" show-checkbox accordion node-key="sid"
                 :default-checked-keys="checkedId" :default-expand-all='true' :check-strictly='true'

src/views/system/userManage/userManageAdd.vue

@@ -21,8 +21,8 @@
           <el-select v-model="form.sysStaffOrg.orgName" placeholder="请选择" style="margin-left: 10px; flex: 0.8;">
             <el-option hidden :key="form.sysStaffOrg.orgSid" :label="form.sysStaffOrg.orgName"
               :value="form.sysStaffOrg.orgName"></el-option>
-            <el-tree :data="treedata" ref="Tree" show-checkbox accordion node-key="sid"
+            <el-tree :data="treedata" ref="Tree" accordion node-key="sid" :default-checked-keys="checkedId"
-              :default-checked-keys="checkedId" :default-expand-all='true' :check-strictly='true' :props="defaultProps"
+              :default-expand-all='true' :check-strictly='true' :props="defaultProps" @node-click="nodeClick"
               @check-change="checkchange">
             </el-tree>
           </el-select>
@@ -185,6 +185,14 @@
       treeNodeClick() {
         this.$refs.el_select.visible = false
       },
+      nodeClick(val) {
+        console.log("nodeClick", val);
+        this.form.sysStaffOrg.orgSid = val.sid
+        this.form.sysStaffOrg.orgName = val.name
+        this.form.sysStaffOrg.orgCode = val.orgCode
+        this.$refs.Tree.visible = false
+
+      },
       checkchange(data, checked, indeterminate) {
 
         console.log("checkchange", data);
@@ -255,7 +263,7 @@
 
 
         if (this.form.sid) {
-          userUpdatauserUpdata(this.form).then(res => {
+          userUpdata(this.form).then(res => {
             if (res.code == '200') {
               this.reset()
               this.$message({

src/views/system/userManage/userManageList.vue

@@ -132,7 +132,7 @@
             <el-select v-model="form.sysStaffOrg.orgName" placeholder="请选择" style="margin-left: 10px; flex: 0.8;">
               <el-option hidden :key="form.sysStaffOrg.orgSid" :label="form.sysStaffOrg.orgName"
                 :value="form.sysStaffOrg.orgName"></el-option>
-              <el-tree :data="treedata" ref="Tree" show-checkbox accordion node-key="sid"
+              <el-tree :data="treedata" ref="Tree" @node-click="nodeClick" accordion node-key="sid"
                 :default-checked-keys="checkedId" :default-expand-all='true' :check-strictly='true'
                 :props="defaultProps" @check-change="checkchange">
               </el-tree>
@@ -343,6 +343,14 @@
 
         }
 
+      },
+      nodeClick(val) {
+        console.log("nodeClick", val);
+        this.form.sysStaffOrg.orgSid = val.sid
+        this.form.sysStaffOrg.orgName = val.name
+        this.form.sysStaffOrg.orgCode = val.orgCode
+        this.$refs.Tree.visible = false
+
       },
       checkchange(data, checked, indeterminate) {
 
@@ -490,6 +498,7 @@
         });
       },
       save() {
+        this.form.orgSid = this.form.orgSid == '' ? window.sessionStorage.getItem('orgSid') : this.form.orgSid
         userUpdata(this.form).then(res => {
           if (res.code == '200') {
             this.$message({