优化

src/components/common/priceInfoList.vue

@@ -142,6 +142,9 @@
   
   const emit = defineEmits(['change']);
     const numCount = (record, idx, k)=> {
+      if (k == 'priceCode') {
+        record.priceName = record.priceCode ? (props.optionSelect.baseIncList.find(i=>i.code == record.priceCode) ||{}).name : ''
+      }
       let uomCode = dataListPrice.value[idx].uomCode
       if (uomCode == 'GJ' && k == 'rateQtyGj') {
         record.rateQtyM3 = record.rateM3Gj ? (Number(record.rateQtyGj || 0)/ Number(record.rateM3Gj)).toFixed(4) : ''
@@ -161,13 +164,13 @@
       let uomCode = dataListPrice.value[idx].uomCode
       let priceDesc = ''
       dataListPrice.value[idx].lngPricePurPngAppSuDtlList.forEach(v=> {
-        let a = v.priceCode ? (props.optionSelect.baseIncList.find(i=>i.code == v.priceCode) ||{}).name : ''
+        // let a = v.priceCode ? (props.optionSelect.baseIncList.find(i=>i.code == v.priceCode) ||{}).name : ''
         let b = ''
         if (uomCode == 'GJ' ) {
-          b=a+(v.rateQtyGj || '')+dataListPrice.value[idx].uomName + ',单价'+(v.priceGj ||'')+';'
+          b=(v.priceName||'')+(v.rateQtyGj || '')+dataListPrice.value[idx].uomName + ',单价'+(v.priceGj ||'')+';'
         }
         if (uomCode == 'M3' ) {
-          b=a+(v.rateQtyM3 || '')+dataListPrice.value[idx].uomName + ',单价'+(v.priceM3 || '')+';'
+          b=(v.priceName||'')+(v.rateQtyM3 || '')+dataListPrice.value[idx].uomName + ',单价'+(v.priceM3 || '')+';'
         }
         priceDesc+=b
       })

src/views/approve/Appro/components/createForm.vue

@@ -71,12 +71,12 @@
                 </a-select>
               </a-form-item>
             </a-col>
-            <a-col :span="22">
+            <a-col :span="24">
               <a-form-item label="内容摘要" name="content" :label-col="{ span: 3 }" :wrapper-col="{ span: 24 }">
                 <a-textarea  v-model:value="formState.content" :disabled="isDisable"  placeholder="请输入备注，最多1000字" :maxlength="1000"  :auto-size="{ minRows: 4, }"/>
               </a-form-item>
             </a-col>
-            <a-col :span="22">
+            <a-col :span="24">
               <a-form-item label="备注" name="note" :label-col="{ span: 3 }" :wrapper-col="{ span: 24 }">
                 <a-textarea  v-model:value="formState.note" :disabled="isDisable"  placeholder="请输入备注，最多200字" :maxlength="200"  :auto-size="{ minRows: 2, maxRows: 5 }"/>
               </a-form-item>

src/views/contract/ContractFact/components/createForm.vue

@@ -99,7 +99,7 @@
                 <a-input v-model:value="formState.amountCn" disabled />
               </a-form-item>
             </a-col>
-              <a-col :span="22">
+              <a-col :span="24">
               <a-form-item label="合同金额说明" name="amountDesc" :label-col="{ span: 3 }" :wrapper-col="{ span: 24 }">
                 <a-textarea  v-model:value="formState.amountDesc" :disabled="isDisable"  placeholder="请输入合同金额说明"  :auto-size="{ minRows: 2, maxRows: 5 }"/>
               </a-form-item>
@@ -187,12 +187,12 @@
                 </a-select>
               </a-form-item>
             </a-col>
-            <a-col :span="22">
+            <a-col :span="24">
               <a-form-item label="合同说明" name="kDesc" :label-col="{ span: 3 }" :wrapper-col="{ span: 24 }">
                 <a-textarea  v-model:value="formState.kDesc" :disabled="isDisable"  placeholder="请输入备注，最多1000字" :maxlength="1000"  :auto-size="{ minRows: 4, }"/>
               </a-form-item>
             </a-col>
-            <a-col :span="22">
+            <a-col :span="24">
               <a-form-item label="备注" name="note" :label-col="{ span: 3 }" :wrapper-col="{ span: 24 }">
                 <a-textarea  v-model:value="formState.note" :disabled="isDisable"  placeholder="请输入备注，最多200字" :maxlength="200"  :auto-size="{ minRows: 2, maxRows: 5 }"/>
               </a-form-item>

src/views/contract/ContractSales/components/createForm.vue

@@ -104,7 +104,7 @@
                 </a-select>
               </a-form-item>
             </a-col>
-            <a-col :span="22">
+            <a-col :span="24">
               <a-form-item label="备注" name="note" :label-col="{ span: 3 }" :wrapper-col="{ span: 24 }">
                 <a-textarea  v-model:value="formState.note" :disabled="isDisable"  placeholder="请输入备注，最多200字" :maxlength="200"  :auto-size="{ minRows: 2, maxRows: 5 }"/>
               </a-form-item>

src/views/dayPlan/Demand/index.vue

@@ -208,7 +208,7 @@
     
     striped: false,
     actionColumn: {
-      width: 180,
+      width: 200,
       title: '操作',
       dataIndex: 'action',
       slots: { customRender: 'action' },

src/views/sales/ScoreCustomer/components/config.ts

@@ -51,7 +51,7 @@ export const columns: BasicColumn[] = [
     title: '评价体系',
     componentType: 'select',
     align: 'left',
-
+     width: 250,
     sorter: true,
   },
   {

src/views/ship/MeaPurInt/components/createForm.vue

@@ -110,7 +110,7 @@
                 <input-number v-model:value="formState.rateTonM3" :disabled="isDisable" :digits="3" :min="0" style="width: 100%" placeholder="请输入"/>
               </a-form-item>
             </a-col>
-            <a-col :span="22">
+            <a-col :span="24">
               <a-form-item label="备注" name="note" :label-col="{ span: 3 }" :wrapper-col="{ span: 24 }">
                 <a-textarea  v-model:value="formState.note" :disabled="isDisable"  placeholder="请输入备注，最多200字" :maxlength="200"  :auto-size="{ minRows: 2, maxRows: 5 }"/>
               </a-form-item>

src/views/ship/ShipSchedule/index.vue

@@ -73,7 +73,7 @@
   
   const tableRef = ref();
   //所有按钮
-  const buttons = ref([{"isUse":true,"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"type":"primary"},{"isUse":true,"name":"船期发送","code":"send","icon":"ant-design:send-outlined","isDefault":true,"type":"primary"},{"isUse":true,"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true},{"isUse":true,"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true},{"isUse":true,"name":"数据日志","code":"datalog","icon":"ant-design:profile-outlined","isDefault":true},{"isUse":true,"name":"采购执行","code":"opspur","icon":"ant-design:folder-view-outlined","isDefault":false},{"isUse":true,"name":"销售执行","code":"opssales","icon":"ant-design:fund-view-outlined","isDefault":false},{"isUse":true,"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true}]);
+  const buttons = ref([{"isUse":true,"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"type":"primary"},{"isUse":true,"name":"船期发送","code":"send","icon":"ant-design:send-outlined","isDefault":true},{"isUse":true,"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true},{"isUse":true,"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true},{"isUse":true,"name":"数据日志","code":"datalog","icon":"ant-design:profile-outlined","isDefault":true},{"isUse":true,"name":"采购执行","code":"opspur","icon":"ant-design:folder-view-outlined","isDefault":false},{"isUse":true,"name":"销售执行","code":"opssales","icon":"ant-design:fund-view-outlined","isDefault":false},{"isUse":true,"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true}]);
   //展示在列表内的按钮
   const actionButtons = ref<string[]>(['view', 'edit','datalog', 'copyData', 'delete', 'startwork','flowRecord', 'opspur', 'opssales']);
   const buttonConfigs = computed(()=>{

src/views/supplier/ScoreSupplier/components/config.ts

@@ -51,7 +51,7 @@ export const columns: BasicColumn[] = [
     title: '评价体系',
     componentType: 'select',
     align: 'left',
-
+    width: 250,
     sorter: true,
   },