aXin-0810 9 kuukautta sitten
vanhempi
commit
2ee52e18b0

+ 1 - 1
src/views/auxiliaryFittings/salesManagement/components/attachmentSalesOrderDetail.vue

@@ -210,7 +210,7 @@
                   "
                   @change="
                     e => {
-                      if (!formData.isImport) {
+                      if (!formData.isImport && formData.orderSource == 'SELF') {
                         dataList = []
                       }
                       formData.storageId = e.storageId

+ 3 - 1
src/views/auxiliaryFittings/salesManagement/components/auxiliarySalesOrderDetail.vue

@@ -210,7 +210,9 @@
                   "
                   @change="
                     e => {
-                      dataList = []
+                      if (!formData.isImport && formData.orderSource == 'SELF') {
+                        dataList = []
+                      }
                       formData.storageId = e.storageId
                       formData.storageName = e.storageName
                     }

+ 4 - 1
src/views/setting/account/index.vue

@@ -173,7 +173,7 @@
               </el-form-item>
             </el-col>
             <el-col :md="6">
-              <el-form-item label="网点" prop="rwaide">
+              <el-form-item label="部门/网点" prop="rwaide">
                 <el-cascader
                   style="width: 100%"
                   :options="departmentList"
@@ -181,6 +181,9 @@
                   v-model="addForm.rwaide"
                   clearable
                 >
+                  <template slot-scope="{ node, data }">
+                    <span>{{ data.isWebsit ? '网点' : '部门' }}-{{ data.deptName }}</span>
+                  </template>
                 </el-cascader>
               </el-form-item>
             </el-col>