From abe0e0db0152626bec2b7698746fd26997fc1869 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Sat, 12 Nov 2022 16:49:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E5=BA=9F=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/jeecg/JEditableTable.vue       |  2 +-
 src/components/jeecg/PEditableTable.vue       | 19 +++++-
 .../jeecg/modal/ProcessDelivery.vue           | 18 +++---
 src/views/activiti/applyList.vue              |  4 +-
 .../form/ProcessSmaterialsScrapForm.vue       | 40 +++++++++++--
 .../activiti/form/ProcessUdgetPlanForm.vue    | 10 +++-
 .../ProcessMaterialsDeliveryListList.vue      | 60 +++++++++----------
 .../ProcessMaterialsDeliveryListModal.vue     |  2 +-
 8 files changed, 102 insertions(+), 53 deletions(-)

diff --git a/src/components/jeecg/JEditableTable.vue b/src/components/jeecg/JEditableTable.vue
index 8b6f9ba..558df48 100644
--- a/src/components/jeecg/JEditableTable.vue
+++ b/src/components/jeecg/JEditableTable.vue
@@ -51,7 +51,7 @@
             />
           </div>
           <div v-if="rowNumber" class="td td-num" :style="style.tdLeft">
-            <span>#</span>
+            <span>序号</span>
           </div>
           <!-- 右侧动态生成td -->
           <template v-for="col in columns">
diff --git a/src/components/jeecg/PEditableTable.vue b/src/components/jeecg/PEditableTable.vue
index 1534b6f..d1ec42c 100644
--- a/src/components/jeecg/PEditableTable.vue
+++ b/src/components/jeecg/PEditableTable.vue
@@ -52,7 +52,7 @@
             />
           </div>
           <div v-if="rowNumber" class="td td-num" :style="style.tdLeft">
-            <span>#</span>
+            <span>序号</span>
           </div>
           <!-- 右侧动态生成td -->
           <template v-for="col in columns">
@@ -536,6 +536,7 @@
                           :placeholder="replaceProps(col, col.placeholder)"
                           @change="(v)=>handleSearchSelectChange(v,id,row,col)"
                           allowClear
+                          @focus="a"
                         />
                         <!--                          :filterOption="filterOption"-->
                         <span
@@ -543,6 +544,7 @@
                           class="j-td-span no-edit"
                           :class="{disabled: buildProps(row,col).disabled}"
                           @click="handleEditRow(row, col)"
+                          @focus="a"
                         >{{ getSelectTranslateText(searchSelectValues[id], row, col) }}</span>
                       </a-tooltip>
                     </template>
@@ -952,6 +954,21 @@
     },
     methods: {
 
+
+      a(){
+        console.log("执行l");
+        this.getSelection((a,b,c)=>{
+          console.log(a,b,c);
+          // b.forEach(item =>{
+          //   console.log(item);
+          // });
+        });
+
+
+
+
+      },
+
       getElement(id, noCaseId = false) {
         if (!this.el[id]) {
           this.el[id] = document.getElementById((noCaseId ? '' : this.caseId) + id)
diff --git a/src/components/jeecg/modal/ProcessDelivery.vue b/src/components/jeecg/modal/ProcessDelivery.vue
index 271a32a..4d388c9 100644
--- a/src/components/jeecg/modal/ProcessDelivery.vue
+++ b/src/components/jeecg/modal/ProcessDelivery.vue
@@ -25,10 +25,10 @@
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+<!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
+<!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
+<!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+<!--              </a>-->
             </span>
             </a-col>
           </a-row>
@@ -49,11 +49,11 @@
 
       <!-- table区域-begin -->
       <div>
-        <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-          <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
-          this.selectedRowKeys.length }}</a>项
-          <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-        </div>
+<!--        <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--          <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{-->
+<!--          this.selectedRowKeys.length }}</a>项-->
+<!--          <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--        </div>-->
 
         <a-table
           ref="table"
diff --git a/src/views/activiti/applyList.vue b/src/views/activiti/applyList.vue
index 9a112d5..8216e1a 100644
--- a/src/views/activiti/applyList.vue
+++ b/src/views/activiti/applyList.vue
@@ -66,13 +66,13 @@
       :scroll="{x: false, y: 470 }"
       @change="handleTableChange">
       <span slot="result" slot-scope="text, r">
-        <span v-if="r.result == 0" style="color: #e78c8c">未提交</span>
+        <span v-if="r.result == 0" style="color: #afa8a8">未提交</span>
         <span v-else-if="r.result==1" style="color: orange">处理中</span>
         <span v-else-if="r.result==2" style="color: green">已通过</span>
         <span v-else-if="r.result==3" style="color: red">已驳回</span>
       </span>
       <span slot="status" slot-scope="text, r">
-        <span v-if="r.status == 0" style="color: #ec7b7b">草稿</span>
+        <span v-if="r.status == 0" style="color: #b8b5b5">草稿</span>
         <span v-else-if="r.result==1" style="color: orange">处理中</span>
         <span v-else-if="r.status==2" style="color: blue">已结束</span>
         <span v-else-if="r.status==3" style="color: magenta">已撤回</span>
diff --git a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
index 4632332..237858a 100644
--- a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
+++ b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
@@ -32,7 +32,7 @@
           </a-col>
           <a-col :span="8">
             <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag type="list" @change="materialType" v-decorator="['materialType']"
+              <j-dict-select-tag type="list"  v-decorator="['materialType']"
                                  :trigger-change="true" dictCode="material_type" placeholder="请选择物资类型" disabled/>
             </a-form-item>
           </a-col>
@@ -55,7 +55,7 @@
     <a-tabs v-model="activeKey" @change="handleChangeTabs">
       <a-tab-pane tab="物资报废流程报废清单" :key="refKeys[0]" :forceRender="true">
         <j-editable-table
-          :ref="refKeys[0]"
+          ref="processSmaterialsScrapList"
           :loading="processSmaterialsScrapListTable.loading"
           :columns="processSmaterialsScrapListTable.columns"
           :dataSource="processSmaterialsScrapListTable.dataSource"
@@ -63,7 +63,8 @@
           :disabled="formDisabled"
           :rowNumber="true"
           :rowSelection="true"
-          :actionButton="true"/>
+          @valueChange ="onSelect"
+          :actionButton="false"/>
       </a-tab-pane>
     </a-tabs>
     <j-form-container>
@@ -154,7 +155,17 @@
           dataSource: [],
           columns: [
             {
-              title: '器材编号',
+              title: '物料组',
+              key: 'materialGroup',
+              type: FormTypes.sel_search,
+              disabled: true,
+              dictCode: '',
+              width: '200px',
+              placeholder: '请输入${title}',
+              defaultValue: ''
+            },
+            {
+              title: '物料编号',
               key: 'equipment',
               type: FormTypes.sel_search,
               disabled: true,
@@ -166,7 +177,7 @@
             {
               title: 'WBS',
               key: 'wbs',
-              type: FormTypes.sel_search,
+              type: FormTypes.input,
               dictCode: '',
               width: '200px',
               placeholder: '请输入${title}',
@@ -346,6 +357,25 @@
       }
     },
     methods: {
+
+      onSelect(record){
+        // console.log(record.row);
+        if(!!record.row.scrapNumber && !!record.row.materialPrice && !! record.row.id){
+          let values = [
+            {
+              rowKey: record.row.id,
+              values: {
+                // 'scrapNumber': '',
+                'materialAmount': record.row.scrapNumber * record.row.materialPrice,
+              },
+            },
+          ]
+          this.$refs.processSmaterialsScrapList.setValues(values);
+        }
+
+
+      },
+
       materialType(val) {
         if (val !== undefined) {
           this.heid = false
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index 2b73ba1..f11083d 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -81,6 +81,7 @@
           :actionButton="true"
           @descriptionFetch="descriptionFetchDatas"
             >
+          <!--          @selectRowChange="selectRowChange"-->
 <!--          <template v-slot:group="props">-->
 <!--            <a-auto-complete-->
 <!--              v-decorator="[`materialGroup`]"-->
@@ -591,6 +592,9 @@
       // this.form.setFieldsValue("materialGroup",123123);
     },
     methods: {
+      selectRowChange(a,b,c){
+        console.log("执行了",a,b,c);
+      },
 
       // handleChange(value, key, column) {
       //   const newData = [...this.data];
@@ -742,7 +746,7 @@
         let isEr = true;
         if(!!record.row.materialGroup){
           if( !!record.row.id  && this.isBu !== record.row.materialGroup ){
-            console.log("1出发了",record.row);
+            // console.log("1出发了",record.row);
             this.isabled = false;
             this.fetchMerchandiseNews(record.row.materialGroup);
             this.isBu = record.row.materialGroup;
@@ -769,7 +773,7 @@
         }
            // console.log("5555出发了",record.row);
         if(!!record.row.materialGroup  && !!record.row.materialNumber  && isEr){
-          console.log("2出发了",record.row);
+          // console.log("2出发了",record.row);
           let materialName = {  }
           // console.log("this.bigIdMerchandiseNewsList",this.bigIdMerchandiseNewsList)
           this.bigIdMerchandiseNewsList.forEach( item => {
@@ -805,7 +809,7 @@
 
         if(!!record.row.materialQuantity  && !!record.row.materialPrice ){
           // record.row.materialAmount = record.row.materialQuantity * record.row.materialPrice;
-          console.log("3出发了",record.row);
+          // console.log("3出发了",record.row);
           //如果单价大于5万
           if(record.row.materialPrice>50000){
             this.materialPrice=record.row.materialPrice
diff --git a/src/views/processmaterials/ProcessMaterialsDeliveryListList.vue b/src/views/processmaterials/ProcessMaterialsDeliveryListList.vue
index 334b0ad..06f1a0a 100644
--- a/src/views/processmaterials/ProcessMaterialsDeliveryListList.vue
+++ b/src/views/processmaterials/ProcessMaterialsDeliveryListList.vue
@@ -1,34 +1,34 @@
 <template>
   <a-card :bordered="false" :class="'cust-erp-sub-tab'">
     <!-- 操作按钮区域 -->
-    <div class="table-operator" v-if="mainId">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('物资出库流程出库清单')">导出</a-button>
-      <a-upload
-        name="file"
-        :showUploadList="false"
-        :multiple="false"
-        :headers="tokenHeader"
-        :action="importExcelUrl"
-        @change="handleImportExcel">
-          <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
+<!--    <div class="table-operator" v-if="mainId">-->
+<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('物资出库流程出库清单')">导出</a-button>-->
+<!--      <a-upload-->
+<!--        name="file"-->
+<!--        :showUploadList="false"-->
+<!--        :multiple="false"-->
+<!--        :headers="tokenHeader"-->
+<!--        :action="importExcelUrl"-->
+<!--        @change="handleImportExcel">-->
+<!--          <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
+<!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+<!--&lt;!&ndash;      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>&ndash;&gt;-->
+<!--      <a-dropdown v-if="selectedRowKeys.length > 0">-->
+<!--        <a-menu slot="overlay">-->
+<!--          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
+<!--        </a-menu>-->
+<!--        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
+<!--      </a-dropdown>-->
+<!--    </div>-->
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
 
       <a-table
         ref="table"
@@ -40,7 +40,6 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
 
         <template slot="htmlSlot" slot-scope="text">
@@ -116,7 +115,7 @@
         // 表头
         columns: [
           {
-            title: '#',
+            title: '序号',
             dataIndex: '',
             key:'rowIndex',
             width:60,
@@ -126,7 +125,7 @@
             }
           },
           {
-            title:'器材编号',
+            title:'物料编号',
             align:"center",
             dataIndex: 'equipment',
           },
@@ -158,7 +157,7 @@
           {
             title:'供货商',
             align:"center",
-            dataIndex: 'supplier',
+            dataIndex: 'supplierId',
           },
           {
             title:'单价',
@@ -174,9 +173,8 @@
             title:'用途',
             align:"center",
             dataIndex: 'purpose',
-            fixed:"right",
+            // fixed:"right",
           },
-
           /*{
             title: '操作',
             dataIndex: 'action',
diff --git a/src/views/processmaterials/modules/ProcessMaterialsDeliveryListModal.vue b/src/views/processmaterials/modules/ProcessMaterialsDeliveryListModal.vue
index f05d314..de9c56b 100644
--- a/src/views/processmaterials/modules/ProcessMaterialsDeliveryListModal.vue
+++ b/src/views/processmaterials/modules/ProcessMaterialsDeliveryListModal.vue
@@ -12,7 +12,7 @@
       <a-form :form="form">
         <a-row>
           <a-col :span="24">
-            <a-form-item label="器材编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-form-item label="物料编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-search-select-tag v-decorator="['equipment']" dict="" />
             </a-form-item>
           </a-col>