snow 2 years ago
parent
commit
3482f15825

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/0.js


+ 4 - 3
src/views/purchaseIn/wsmInOrder/detail.vue

@@ -32,12 +32,13 @@
                   </el-popover>
                 </template>
                 <template slot="wsm">
-                  <span>{{ sitem.wsm_supplier }}/{{ sitem.wsm_name }}</span>
+                  <!-- {{ sitem.wsm_supplier }}/ -->
+                  <span>{{ sitem.wsm_name }}</span>
                   <el-popover placement="top" width="300" trigger="hover">
                     <ul>
-                      <li>
+                      <!-- <li>
                         <span>仓库公司编号:</span><span>{{ sitem.wsm_supplierNo }}</span>
-                      </li>
+                      </li> -->
                       <li>
                         <span>仓库名称编号:</span><span>{{ sitem.wsm_code }}</span>
                       </li>

+ 5 - 2
src/views/serviceParam/storeSet/addEdit.vue

@@ -40,7 +40,7 @@
                 <search-work-company
                   :value="ruleForm.companyNo"
                   :placeholder="'业务公司'"
-                  :disabled="isDetail"
+                  :disabled="isDetail || isUpdate"
                   :size="'mini'"
                   :is-detail="false"
                   @searchChange="companyNosearchChange"
@@ -82,7 +82,7 @@
                   <el-select
                     v-model="ruleForm.wsmtype"
                     style="width: 100%"
-                    :disabled="isDetail"
+                    :disabled="isDetail || isUpdate"
                     placeholder="仓库类型"
                   >
                     <el-option
@@ -228,6 +228,9 @@ export default {
   mixins: [resToken],
   props: ['showModel', 'id', 'isDetail'],
   computed: {
+    isUpdate() {
+      return this.id !== 'add' && !this.isDetail
+    },
     ...mapGetters(['business_companyNo'])
   },
   data() {

Some files were not shown because too many files changed in this diff