Merge branch 'purchaseDev' into 'dev'

Purchase dev

See merge request new-business/drp-web!478

src/components/popover-select/index.vue

@@ -283,14 +283,16 @@ export default {
   <div class="popover-select">
     <el-autocomplete
       clearable
+      
       v-bind="$attrs"
       v-model="innerValue"
       :value-key="valueKey"
       :fetch-suggestions="useAutocomplete"
       @select="useConfirm([$event])"
+      :disabled="disabled"
       style="width: 100%"
     >
-      <i class="el-icon-search" slot="suffix" @click="open"> </i>
+      <i :size="size" class="el-icon-search" slot="suffix" @click="!disabled && open"> </i>
       <template slot-scope="{ item }">
         <p
           style="
@@ -347,6 +349,7 @@ export default {
       >
         <el-form-item prop="search">
           <el-input
+            :size="size"
             v-model="model.search"
             @change="useQuery"
             @keydown.enter="useQuery"

src/views/purchase/purchase-order/column.js

@@ -340,7 +340,7 @@ export const TableColumns = [
     },
   },
   { 
-    item:{ key: "contacts", title: "收获联系人" ,},
+    item:{ key: "contacts", title: "收货联系人" ,},
     attr:{
       isHidden:true,
     },

src/views/purchase/purchase-order/see/index.vue

@@ -93,7 +93,12 @@ export default {
     },
     // 取 消
     handleCancel() {
-      this.params = initParams(Columns);
+      // this.params = initParams(Columns);
+      this.params = {
+        ...initParams(this.columns),
+        puOrderItemList: [],
+        puOrderExecuteList: [],
+      }
       this.setVisible(false);
     },
     handleRefresh(){
@@ -322,13 +327,23 @@ export default {
             :label="column.title" 
             :name="column.key"
           >
-            <el-table :data="params[column.key]" style="width: 100%"  border>
+            <el-table 
+              :data="params[column.key].filter(item => item.delFlag === '0')" 
+              style="width: 100%"  
+              :height="params[column.key].filter(item => item.delFlag === '0').length ? 300 : 100"
+              border
+            >
+              <el-table-column label="序号">
+                <template slot-scope="scope">
+                  {{ scope.$index + 1 }}
+                </template>
+              </el-table-column>
               <el-table-column 
                 v-for="(cColumn, cIndex) in column.tableColumns" 
                 :key="cIndex" 
                 :prop="cColumn.key"
                 :label="cColumn.title" 
-                :width="cColumn.width || 80"
+                :width="cColumn.width"
               >
                 <template slot="header" slot-scope="scope">
                   <span v-if="cColumn.require" style="color: #ff4949">*</span>
@@ -337,65 +352,71 @@ export default {
                   </span>
                 </template>
                 <template slot-scope="scope">
-                  <el-tag v-if="cColumn.key === 'index'">
-                    {{ scope.$index + 1 }}
-                  </el-tag>
-                  <el-input v-if="cColumn.inputType === 'Input'" 
-                    v-model="scope.row[cColumn.key]"
-                    :placeholder="cColumn.placeholder" 
-                    :clearable="cColumn.clearable" 
-                    readonly 
-                    size="mini"
-                    style="width: 100%"
-                  ></el-input>
-
-                  <!--  -->
-                  <dr-popover-select v-if="cColumn.inputType === 'PopoverSelect'"
-                    v-model="scope.row[cColumn.key]"
-                    :source.sync="scope.row" 
-                    :title="cColumn.title" 
-                    :value-key="cColumn.valueKey" 
-                    disabled
-                    :type="cColumn.referName" 
-                    :multiple="cColumn.multiple" 
-                    :placeholder="cColumn.placeholder"
-                    :data-mapping="cColumn.dataMapping" 
-                    :query-params="cColumn.queryParams" 
-                  ></dr-popover-select>
-
-                  <el-input-number v-if="cColumn.inputType === 'InputNumber'" 
-                    v-model="scope.row[cColumn.key]"
-                    :precision="cColumn.precision"
-                    :controls-position="cColumn.controlsPosition" 
-                    :placeholder="cColumn.placeholder"
-                    :clearable="cColumn.clearable" 
-                    disabled 
-                    size="mini" 
-                    style="width: 100%"
-                  ></el-input-number>
-
-                  <el-select v-if="cColumn.inputType === 'Select'" 
-                    v-model="scope.row[cColumn.key]" 
-                    disabled 
-                    size="mini"
-                    :clearable="cColumn.clearable" 
-                    :placeholder="cColumn.placeholder" 
-                    style="width: 100%">
-                    <el-option 
-                      v-for="item in dict.type[cColumn.referName]" 
-                      :key="item.value" 
-                      :label="item.label"
-                      :value="item.value"
-                    ></el-option>
-                  </el-select>
-
-                  <el-checkbox v-if="cColumn.inputType === 'Checkbox'" 
-                    v-model="scope.row[cColumn.key]" 
-                    disabled
-                    true-label="Y" 
-                    false-label="N"
-                  ></el-checkbox>
+                  <el-form-item  label-width="0">
+                    <span v-if="!cColumn.inputType">
+                      {{ scope.row[cColumn.key] }}
+                    </span>
+                    
+                    <el-input v-if="cColumn.inputType === 'Input'" 
+                      v-model="scope.row[cColumn.key]"
+                      :placeholder="cColumn.placeholder" 
+                      :clearable="cColumn.clearable" 
+                      readonly 
+                      size="mini"
+                      style="width: 100%"
+                    ></el-input>
+
+                    <!--  -->
+                    <dr-popover-select v-if="cColumn.inputType === 'PopoverSelect'"
+                      v-model="scope.row[cColumn.key]"
+                      :source.sync="scope.row" 
+                      :title="cColumn.title" 
+                      :value-key="cColumn.valueKey" 
+                      disabled
+                      :type="cColumn.referName" 
+                      :multiple="cColumn.multiple" 
+                      :placeholder="cColumn.placeholder"
+                      :data-mapping="cColumn.dataMapping" 
+                      :query-params="cColumn.queryParams" 
+                      size="mini" 
+                    ></dr-popover-select>
+
+                    <el-input-number v-if="cColumn.inputType === 'InputNumber'" 
+                      v-model="scope.row[cColumn.key]"
+                      :precision="cColumn.precision"
+                      :controls-position="cColumn.controlsPosition" 
+                      :placeholder="cColumn.placeholder"
+                      :clearable="cColumn.clearable" 
+                      disabled 
+                      size="mini" 
+                      style="width: 100%"
+                    ></el-input-number>
+
+                    <el-select v-if="cColumn.inputType === 'Select'" 
+                      v-model="scope.row[cColumn.key]" 
+                      disabled 
+                      size="mini"
+                      :clearable="cColumn.clearable" 
+                      :placeholder="cColumn.placeholder" 
+                      style="width: 100%">
+                      <el-option 
+                        v-for="item in dict.type[cColumn.referName]" 
+                        :key="item.value" 
+                        :label="item.label"
+                        :value="item.value"
+                      ></el-option>
+                    </el-select>
+
+                    <el-checkbox v-if="cColumn.inputType === 'Checkbox'" 
+                      v-model="scope.row[cColumn.key]" 
+                      disabled
+                      true-label="Y" 
+                      false-label="N"
+                    ></el-checkbox>
+
 
+                  </el-form-item>
+                  
                 </template>
               </el-table-column>
             </el-table>