Merge remote-tracking branch 'origin/master'

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

@@ -53,7 +53,7 @@
           </el-col>
           <el-col :span="12">
             <div class="span-sty"><span class="icon">*</span>库管人员</div>
-            <el-form-item prop="libTubeName">
+            <el-form-item prop="libTubeSid">
               <el-select v-model="formobj.libTubeSid" placeholder="请选择" @change="changeLibTube" filterable clearable class="addinputInfo">
                 <el-option v-for="item in libTube_list" :key="item.userSid" :label="item.userName" :value="item.userSid" />
               </el-select>
@@ -128,7 +128,7 @@ export default {
         warehouseAttribute: [{ required: true, message: '存放地点详细地址不能为空', trigger: 'blur' }], // 存放地点属性
         warehouseContract: [{ required: true, message: '存放地点负责人不能为空', trigger: 'blur' }], // 存放地点负责人
         warehouseGroupKey: [{ required: true, message: '分组不能为空', trigger: 'change' }], // 分组
-        libTubeName: [{ required: true, message: '库管人员不能为空', trigger: 'change' }]
+        libTubeSid: [{ required: true, message: '库管人员不能为空', trigger: 'change' }]
       }
     }
   },
@@ -240,9 +240,9 @@ export default {
     changeLibTube(value) {
       const choosetItem = this.libTube_list.filter((item) => item.userSid === value)
       if (choosetItem.length > 0 && choosetItem !== null) {
-        this.formobj.libTubeSid = choosetItem[0].userName
+        this.formobj.libTubeName = choosetItem[0].userName
       } else {
-        this.formobj.libTubeSid = ''
+        this.formobj.libTubeName = ''
       }
     },
     saveAdd() {

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

@@ -3,83 +3,63 @@
     <!--标题按钮部分开始-->
     <div class="tab-header webtop">
       <!--标题-->
-      <div>存放地点详情</div>
+      <div>{{ viewTitle }}</div>
-      <!--start 详情按钮-->
+      <!--start 添加修改按钮-->
       <div>
         <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
       </div>
+      <!--end 添加修改按钮-->
       <!--end 详情按钮-->
     </div>
     <!--标题按钮部分结束-->
+    <!--Start 新增修改部分-->
     <div class="listconadd">
       <div class="titwu"><span>存放地点</span></div>
-      <el-form ref="form_obj" :model="formobj" class="formadd">
+      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
         <el-row style="border-top: 1px solid #E0E3EB">
-          <el-col :span="3" class="tleftb">
+          <el-col :span="24">
-            <span>使用组织</span>
+            <el-form-item><span style="color: red">注：存放地点名称、详细地址会在相关合同中显示，请安要求认真填写</span></el-form-item>
-          </el-col>
-          <el-col :span="9">
-            <el-form-item>
-              <span>{{ formobj.useOrg }}</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3" class="tleftb">
-            <span>编码</span>
-          </el-col>
-          <el-col :span="9">
-            <el-form-item>
-              <span>{{ formobj.gressionCode }}</span>
-            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="3" class="tleftb">
+          <el-col :span="12">
-            <span>名称</span>
+            <div class="span-sty">使用组织</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.useOrg }}</span></el-form-item>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="12">
-            <el-form-item>
+            <div class="span-sty">编码</div>
-              <span>{{ formobj.warehouseName }}</span>
+            <el-form-item><span class="addinputInfo">{{ formobj.gressionCode }}</span></el-form-item>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3" class="tleftb">
-            <span>负责人及电话</span>
-          </el-col>
-          <el-col :span="9">
-            <el-form-item>
-              <span>{{ formobj.warehouseContract }}</span>
-            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="3" class="tleftb">
+          <el-col :span="12">
-            <span>分组</span>
+            <div class="span-sty">名称</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.warehouseName }}</span></el-form-item>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="12">
-            <el-form-item>
+            <div class="span-sty">负责人及电话</div>
-              <span>{{ formobj.warehouseGroupValue }}</span>
+            <el-form-item><span class="addinputInfo">{{ formobj.warehouseContract }}</span></el-form-item>
-            </el-form-item>
           </el-col>
-          <el-col :span="3" class="tleftb">
+        </el-row>
-            <span>库管人员</span>
+        <el-row>
+          <el-col :span="12">
+            <div class="span-sty">分组</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.warehouseGroupValue }}</span></el-form-item>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="12">
-            <el-form-item>
+            <div class="span-sty">库管人员</div>
-              <span>{{ formobj.libTubeName }}</span>
+            <el-form-item><span class="addinputInfo">{{ formobj.libTubeName }}</span></el-form-item>
-            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="3" class="tleftb">
+          <el-col :span="24">
-            <span>详细地址</span>
+            <div class="span-sty">详细地址</div>
-          </el-col>
+            <el-form-item><span class="addinputInfo">{{ formobj.city }}{{ formobj.county }}{{ formobj.warehouseAttribute }}</span></el-form-item>
-          <el-col :span="21">
-            <el-form-item>
-              <span>{{ formobj.warehouseAttribute }}</span>
-            </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </div>
+    <!--End 添加修改部分-->
   </div>
 </template>
 
@@ -90,35 +70,78 @@ export default {
   name: 'ScmWarehouseInfo',
   data() {
     return {
-      formobj: {}
+      viewTitle: '',
+      formobj: {
+        sid: '',
+        useOrg: '', // 使用组织
+        useOrgSid: '', // 使用组织sid
+        gressionCode: '', // 编码
+        warehouseName: '', // 名称
+        warehouseAttribute: '', // 存放地点属性
+        warehouseContract: '', // 存放地点负责人
+        warehouseContractSid: '', // 存放地点负责人sid
+        warehouseGroupValue: '',
+        warehouseGroupKey: '',
+        libTubeName: '',
+        libTubeSid: '',
+        provinceSid: '',
+        province: '',
+        citySid: '',
+        city: '',
+        countySid: '',
+        county: ''
+      },
+      rules: {}
     }
   },
   methods: {
-    handleReturn() {
-      this.formobj = {}
-      this.$emit('doback')
-    },
     showInfo(row) {
-      this.formobj = row
+      this.$nextTick(() => {
-      req.fetchBySid(row.sid).then(resp => {
+        this.$refs['form_obj'].clearValidate()
-        const vdata = resp.data
+      })
-        this.formobj.id = vdata.id
+      this.dialogStatus = 'edit'
-        this.formobj.sid = vdata.sid // SID
+      this.viewTitle = '存放地点详情'
-        this.formobj.useOrg = vdata.useOrg // 使用组织
+      req.fetchBySid(row.sid).then((resp) => {
-        this.formobj.warehouseName = vdata.warehouseName // 名称
+        if (resp.success) {
-        this.formobj.gressionCode = vdata.gressionCode // 编码
+          this.formobj = resp.data
-        this.formobj.warehouseAttribute = vdata.warehouseAttribute // 存放地点属性
+        }
-        this.formobj.warehouseContract = vdata.warehouseContract // 存放地点负责人
-        this.formobj.warehouseContractSid = vdata.warehouseContractSid // 存放地点负责人sid
-        this.formobj.warehouseGroupKey = vdata.warehouseGroupKey // 分组
-        this.formobj.warehouseGroupValue = vdata.warehouseGroupValue // 分组
       }).catch(e => {
         this.formobj = row
       })
+    },
+    handleReturn() {
+      this.formobj = {
+        sid: '',
+        useOrg: '', // 使用组织
+        useOrgSid: '', // 使用组织sid
+        gressionCode: '', // 编码
+        warehouseName: '', // 名称
+        warehouseAttribute: '', // 存放地点属性
+        warehouseContract: '', // 存放地点负责人
+        warehouseContractSid: '', // 存放地点负责人sid
+        warehouseGroupValue: '',
+        warehouseGroupKey: '',
+        libTubeName: '',
+        libTubeSid: '',
+        provinceSid: '',
+        province: '',
+        citySid: '',
+        city: '',
+        countySid: '',
+        county: ''
       }
+      this.$refs['form_obj'].resetFields()
+      this.$emit('doback')
+    },
   }
 }
 </script>
 
 <style scoped>
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
 </style>