build

src/views/interest/organize/index.vue

@@ -239,7 +239,7 @@ export default {
       };
       this.searchList();
     },
-    onCompanyChange() { //TODO
+    onCompanyChange() { //MARK
       this.parmValue.pid = "";
       this.titleList = [];
       this.depart = [];

src/views/sellOut/sellAfterApply/components/set-work-order.vue

@@ -52,7 +52,7 @@
         </el-table-column>
         <el-table-column v-if="!isStock" min-width="160px" show-overflow-tooltip>
           <template slot="header">
-            <span style="color:red;margin-right:2px">*</span>退货仓库编码
+            <span style="color:red;margin-right:2px">*</span>退货仓库
           </template>
           <template slot-scope="scope">
             <el-form-item :prop="`${scope.$index}.return_wsm_code`" :rules="paramsRules.return_wsm_code">

src/views/sellOut/sellReturn/components/set-work-order.vue

@@ -48,9 +48,10 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column min-width="160px" show-overflow-tooltip>
+
+            <el-table-column v-if="!state.isStock" min-width="160px" show-overflow-tooltip>
               <template slot="header">
-                <span style="color:red;margin-right:2px">*</span>退货仓库编码
+                <span style="color:red;margin-right:2px">*</span>退货仓库
               </template>
               <template slot-scope="scope">
                 <el-form-item :prop="`${scope.$index}.return_wsm_code`" :rules="paramsRules.return_wsm_code">
@@ -61,19 +62,30 @@
                     :is-relation="true"
                     :wsmtype="'5'"
                     :company-no="currentCompany"
-                    :is-detail="state.isStock"
-                    :disabled="state.isStock"
                     :names="''"
                     @searchChange="onStockChange($event, scope.$index)"
                   />
-                </el-form-item>
-              </template>
+
+                </el-form-item></template>
             </el-table-column>
 
             <el-table-column label="退货仓库" align="center">
-              <el-table-column label="所在供应商名称" prop="returnSupplierName" min-width="160px" show-overflow-tooltip />
+              <!-- <el-table-column label="所在供应商名称" prop="returnSupplierName" min-width="160px" show-overflow-tooltip />
               <el-table-column label="所在供应商编码" prop="returnSupplierNo" min-width="160px" show-overflow-tooltip />
-              <el-table-column label="负责人" width="110px" prop="returnSupplierNameContactor" show-overflow-tooltip />
+              <el-table-column label="负责人" width="110px" prop="returnSupplierNameContactor" show-overflow-tooltip /> -->
+
+              <tempalte v-if="state.isStock">
+                <el-table-column label="负责人" min-width="110px" prop="contactor_name" show-overflow-tooltip />
+                <el-table-column label="仓库名称" prop="wsm_name" min-width="160px" show-overflow-tooltip />
+                <el-table-column label="所在供应商名称" prop="supplierName" min-width="160px" show-overflow-tooltip />
+                <el-table-column label="所在供应商编码" prop="supplierNo" min-width="160px" show-overflow-tooltip />
+              </tempalte>
+
+              <template v-else>
+                <el-table-column label="所在供应商名称" prop="returnSupplierName" min-width="160px" show-overflow-tooltip />
+                <el-table-column label="所在供应商编码" prop="returnSupplierNo" min-width="160px" show-overflow-tooltip />
+                <el-table-column label="负责人" min-width="110px" prop="returnSupplierNameContactor" show-overflow-tooltip />
+              </template>
             </el-table-column>
           </el-table>
         </div>