Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue

@@ -51,22 +51,23 @@
         <div class="">
           <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
                     @selection-change="handleSelectionChange">
-            <el-table-column width="50px" type="selection" align="center"/>
-            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column width="50" type="selection" align="center"/>
+            <el-table-column width="80" label="序号" type="index" :index="indexMethod" align="center"/>
             <!--            <el-table-column width="160px" label="编码" align="center">-->
             <!--              <template slot-scope="scope">-->
             <!--                <span class="bluezi" @click="toInfo(scope.row)">{{ scope.row.warehouseCode }}</span>-->
             <!--              </template>-->
             <!--            </el-table-column>-->
-            <el-table-column width="200px" prop="warehouseName" label="名称" align="center">
+            <el-table-column width="240" prop="gressionCode" label="编码" align="center"/>
+            <el-table-column width="200" prop="warehouseName" label="名称" align="center">
               <template slot-scope="scope">
                 <span class="bluezi" @click="toInfo(scope.row)">{{ scope.row.warehouseName }}</span>
               </template>
             </el-table-column>
-            <el-table-column width="240px" prop="useOrg" label="使用组织" align="center"/>
+            <el-table-column width="240" prop="useOrg" label="使用组织" align="center"/>
             <el-table-column prop="warehouseAttribute" label="详细地址" align="center"/>
-            <el-table-column width="200px" prop="warehouseContract" label="负责人及电话" align="center"/>
-            <el-table-column width="140px" prop="warehouseGroupValue" label="分组" align="center"/>
+            <el-table-column width="200" prop="warehouseContract" label="负责人及电话" align="center"/>
+            <el-table-column width="140" prop="warehouseGroupValue" label="分组" align="center"/>
           </el-table>
         </div>
         <!--End 项目列表-->

anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue

@@ -18,12 +18,6 @@
     <div class="listconadd">
       <div class="titwu"><span>存放地点</span></div>
       <el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
-        <!--        <el-row>-->
-        <!--          <el-col :span="18" class="specialCol">-->
-        <!--            <span>使用组织：</span>-->
-        <!--            <span>{{ formobj.useOrg }}</span>-->
-        <!--          </el-col>-->
-        <!--        </el-row>-->
         <el-row style="border-top: 1px solid #E0E3EB">
           <el-col :span="3" class="tleftb">
             <span><span class="icon">*</span>使用组织</span>
@@ -33,6 +27,16 @@
               <el-input v-model="formobj.useOrg" placeholder="使用组织" class="addinputw" :disabled="true"/>
             </el-form-item>
           </el-col>
+          <el-col :span="3" class="tleftb">
+            <span><span class="icon">*</span>编码</span>
+          </el-col>
+          <el-col :span="9">
+            <el-form-item prop="gressionCode">
+              <el-input v-model="formobj.gressionCode" placeholder="编码" class="addinputw" clearable/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="3" class="tleftb">
             <span><span class="icon">*</span>名称</span>
           </el-col>
@@ -41,8 +45,6 @@
               <el-input v-model="formobj.warehouseName" placeholder="名称" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="3" class="tleftb">
             <span><span class="icon">*</span>负责人及电话</span>
           </el-col>
@@ -51,6 +53,8 @@
               <el-input v-model="formobj.warehouseContract" placeholder="负责人及电话" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="3" class="tleftb">
             <span><span class="icon">*</span>分组</span>
           </el-col>
@@ -61,16 +65,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="3" class="tleftb">
-            <span><span class="icon">*</span>详细地址</span>
-          </el-col>
-          <el-col :span="9">
-            <el-form-item prop="warehouseAttribute">
-              <el-input v-model="formobj.warehouseAttribute" placeholder="详细地址" class="addinputw" clearable/>
-            </el-form-item>
-          </el-col>
           <el-col :span="3" class="tleftb">
             <span><span class="icon">*</span>库管人员</span>
           </el-col>
@@ -82,6 +76,16 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="3" class="tleftb">
+            <span><span class="icon">*</span>详细地址</span>
+          </el-col>
+          <el-col :span="21">
+            <el-form-item prop="warehouseAttribute">
+              <el-input v-model="formobj.warehouseAttribute" placeholder="详细地址" class="addinputw" clearable/>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
     <!--End 添加修改部分-->
@@ -126,7 +130,7 @@ export default {
         sid: '',
         useOrg: '', // 使用组织
         useOrgSid: '', // 使用组织sid
-        // warehouseCode: '', // 编码
+        gressionCode: '', // 编码
         warehouseName: '', // 名称
         warehouseAttribute: '', // 存放地点属性
         warehouseContract: '', // 存放地点负责人
@@ -139,7 +143,7 @@ export default {
       rules: {
         useOrg: [{ required: true, message: '使用组织不能为空', trigger: 'change' }], // 使用组织
         useOrgSid: [{ required: true, message: '使用组织sid不能为空', trigger: 'blur' }], // 使用组织sid
-        // warehouseCode: [{ required: true, message: '编码不能为空', trigger: 'blur' }], // 编码
+        gressionCode: [{ required: true, message: '编码不能为空', trigger: 'blur' }], // 编码
         warehouseName: [{ required: true, message: '名称不能为空', trigger: 'blur' }], // 名称
         warehouseAttribute: [{ required: true, message: '存放地点详细地址不能为空', trigger: 'blur' }], // 存放地点属性
         warehouseContract: [{ required: true, message: '存放地点负责人不能为空', trigger: 'blur' }], // 存放地点负责人
@@ -313,7 +317,7 @@ export default {
       this.formobj.sid = '' // SID
       this.formobj.useOrg = '' // 使用组织
       this.useOrgSid = '' // 使用组织sid
-      // this.warehouseCode = '' // 编码
+      this.gressionCode = '' // 编码
       this.formobj.warehouseName = '' // 名称
       this.formobj.warehouseAttribute = '' // 存放地点属性
       this.formobj.warehouseContract = '' // 存放地点负责人
@@ -345,7 +349,7 @@ export default {
         this.formobj.id = vdata.id
         this.formobj.sid = vdata.sid // SID
         this.formobj.useOrg = vdata.useOrg // 使用组织
-        // this.formobj.warehouseCode = vdata.warehouseCode // 编码
+        this.formobj.gressionCode = vdata.gressionCode // 编码
         this.formobj.warehouseName = vdata.warehouseName // 名称
         this.formobj.warehouseAttribute = vdata.warehouseAttribute // 存放地点属性
         this.formobj.warehouseContract = vdata.warehouseContract // 存放地点负责人

anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseInfo.vue

@@ -14,12 +14,6 @@
     <div class="listconadd">
       <div class="titwu"><span>存放地点</span></div>
       <el-form ref="form_obj" :model="formobj" class="formadd">
-        <!--        <el-row>-->
-        <!--          <el-col :span="18" class="specialCol">-->
-        <!--            <span>使用组织：</span>-->
-        <!--            <span>{{ formobj.useOrg }}</span>-->
-        <!--          </el-col>-->
-        <!--        </el-row>-->
         <el-row style="border-top: 1px solid #E0E3EB">
           <el-col :span="3" class="tleftb">
             <span>使用组织</span>
@@ -30,39 +24,39 @@
             </el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">
-            <span>名称</span>
+            <span>编码</span>
           </el-col>
           <el-col :span="9">
             <el-form-item>
-              <span>{{ formobj.warehouseName }}</span>
+              <span>{{ formobj.gressionCode }}</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="3" class="tleftb">
-            <span>负责人及电话</span>
+            <span>名称</span>
           </el-col>
           <el-col :span="9">
             <el-form-item>
-              <span>{{ formobj.warehouseContract }}</span>
+              <span>{{ formobj.warehouseName }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">
-            <span>分组</span>
+            <span>负责人及电话</span>
           </el-col>
           <el-col :span="9">
             <el-form-item>
-              <span>{{ formobj.warehouseGroupValue }}</span>
+              <span>{{ formobj.warehouseContract }}</span>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="3" class="tleftb">
-            <span>详细地址</span>
+            <span>分组</span>
           </el-col>
           <el-col :span="9">
             <el-form-item>
-              <span>{{ formobj.warehouseAttribute }}</span>
+              <span>{{ formobj.warehouseGroupValue }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="3" class="tleftb">
@@ -74,6 +68,16 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="3" class="tleftb">
+            <span>详细地址</span>
+          </el-col>
+          <el-col :span="21">
+            <el-form-item>
+              <span>{{ formobj.warehouseAttribute }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </div>
   </div>
@@ -102,6 +106,7 @@ export default {
         this.formobj.sid = vdata.sid // SID
         this.formobj.useOrg = vdata.useOrg // 使用组织
         this.formobj.warehouseName = vdata.warehouseName // 名称
+        this.formobj.gressionCode = vdata.gressionCode // 编码
         this.formobj.warehouseAttribute = vdata.warehouseAttribute // 存放地点属性
         this.formobj.warehouseContract = vdata.warehouseContract // 存放地点负责人
         this.formobj.warehouseContractSid = vdata.warehouseContractSid // 存放地点负责人sid