プロジェクト

全般

プロフィール

リビジョン 168

堀内7年以上前に追加

台帳未作成画面受注日追加
メニューセルサイズ変更修正
台帳連動変更途中
売上確認変更途中

差分を表示:

branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
14 14
        /// <summary>
15 15
        /// 本体バージョン
16 16
        /// </summary>
17
        public static int s_SystemVersion = 39;
17
        public static int s_SystemVersion = 40;
18 18

  
19 19
        /// <summary>
20 20
        /// コピー・環境バージョン
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs
7757 7757
            {
7758 7758
                // 請求処理連携以外は処理しない
7759 7759
                if (!m_BillingProc) return;
7760
                
7761
                // 支払カラム以外は処理しない
7762
                int FixColCnt = Enum.GetNames(typeof(GridColumn)).Length;
7763
                if (SetCol < FixColCnt) return;
7760 7764

  
7761 7765
                DataGridView dgv = dgvAllDisplay;
7766
                // 明細行以外は処理しない
7767
                if (CommonMotions.cnvInt(dgv.Rows[SetRow].Cells[(int)GridColumn.TitleFlg].Value) == 0
7768
                    && CommonMotions.cnvInt(dgv.Rows[SetRow].Cells[(int)GridColumn.TotalFlg].Value) == 0
7769
                    && CommonMotions.cnvInt(dgv.Rows[SetRow].Cells[(int)GridColumn.BlankFlg].Value) == 0)
7770
                {
7771
                    // 明細データ行
7772
                }
7773
                else
7774
                {   // それ以外
7775
                    return;
7776
                }
7762 7777

  
7778
                // データセット
7763 7779
                dgv.Rows[SetRow].Cells[SetCol].Value = m_AddingRequestPrice;
7764 7780
                dgv.EndEdit();
7781
                // 変更フラグON
7782
                m_bChengeAns = true;
7765 7783
            }
7766 7784
            catch (Exception ex)
7767 7785
            {
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/ConstrReqList/FrmConstrReqListAuxiliary.cs
257 257
            try
258 258
            {
259 259
                int Status1 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("????????")).Key;
260
                int Status2 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("?? ?? ??")).Key;
261 260

  
262 261
                strSQL = "SELECT * FROM (";
263 262
                for (int i = 0; i < 2; i++)
......
330 329
                    switch (i)
331 330
                    {
332 331
                        case 0:
333
                            strSQL += string.Format(" AND (A.CONSTRUCTIONSTATUSFLG != {0}", Status2);
334
                            strSQL += string.Format(" AND A.CONSTRUCTIONSTATUSFLG >= {0})", Status1);
332
                            strSQL += string.Format(" AND A.CONSTRUCTIONSTATUSFLG = {0}", Status1);
335 333
                            break;
336 334
                        case 1:
337 335
                            strSQL += " AND E.MAINCONSTRUCTIONCODE = B.CONSTRUCTIONCODE";
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirm.Designer.cs
28 28
        /// </summary>
29 29
        private void InitializeComponent()
30 30
        {
31
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
32
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
41
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
42
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
43
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
44
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
45
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
46
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
47
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
48
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
49
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
50
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
51
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
52
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
53
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
54
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
55
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
56
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
57
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
31
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
32
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
41
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
42
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
43
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle();
44
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
45
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
46
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle();
47
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle();
48
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle();
49
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle();
50
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle();
51
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle48 = new System.Windows.Forms.DataGridViewCellStyle();
52
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle49 = new System.Windows.Forms.DataGridViewCellStyle();
53
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle50 = new System.Windows.Forms.DataGridViewCellStyle();
54
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle51 = new System.Windows.Forms.DataGridViewCellStyle();
55
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle52 = new System.Windows.Forms.DataGridViewCellStyle();
56
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle53 = new System.Windows.Forms.DataGridViewCellStyle();
57
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle54 = new System.Windows.Forms.DataGridViewCellStyle();
58 58
            this.label3 = new System.Windows.Forms.Label();
59 59
            this.panel1 = new System.Windows.Forms.Panel();
60
            this.groupBoxEx1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
61
            this.comboBox1 = new System.Windows.Forms.ComboBox();
62
            this.label1 = new System.Windows.Forms.Label();
63
            this.radioButton2 = new System.Windows.Forms.RadioButton();
64
            this.radioButton1 = new System.Windows.Forms.RadioButton();
65 60
            this.label7 = new System.Windows.Forms.Label();
66 61
            this.label6 = new System.Windows.Forms.Label();
67 62
            this.numericUpDown2 = new System.Windows.Forms.NumericUpDown();
......
149 144
            this.ApprovalDate_10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
150 145
            this.ApprovalOrder_10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
151 146
            this.btnEnd = new System.Windows.Forms.Button();
147
            this.groupBoxEx1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
148
            this.comboBox1 = new System.Windows.Forms.ComboBox();
149
            this.label8 = new System.Windows.Forms.Label();
150
            this.radioButton2 = new System.Windows.Forms.RadioButton();
151
            this.radioButton1 = new System.Windows.Forms.RadioButton();
152 152
            this.panel1.SuspendLayout();
153
            this.groupBoxEx1.SuspendLayout();
154 153
            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit();
155 154
            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).BeginInit();
155
            this.groupBoxEx1.SuspendLayout();
156 156
            this.SuspendLayout();
157 157
            // 
158 158
            // label3
159 159
            // 
160 160
            this.label3.Anchor = System.Windows.Forms.AnchorStyles.Top;
161
            this.label3.BackColor = System.Drawing.Color.White;
162
            this.label3.Font = new System.Drawing.Font("MS Pゴシック", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
163
            this.label3.Location = new System.Drawing.Point(561, 8);
161
            this.label3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
162
            this.label3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
163
            this.label3.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold);
164
            this.label3.Location = new System.Drawing.Point(417, 10);
164 165
            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
165 166
            this.label3.Name = "label3";
166
            this.label3.Size = new System.Drawing.Size(292, 34);
167
            this.label3.Size = new System.Drawing.Size(500, 20);
167 168
            this.label3.TabIndex = 3;
168 169
            this.label3.Text = "売 上 確 認";
169 170
            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......
173 174
            this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
174 175
            | System.Windows.Forms.AnchorStyles.Right)));
175 176
            this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
177
            this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
176 178
            this.panel1.Controls.Add(this.groupBoxEx1);
177 179
            this.panel1.Controls.Add(this.label7);
178 180
            this.panel1.Controls.Add(this.label6);
......
182 184
            this.panel1.Controls.Add(this.label4);
183 185
            this.panel1.Controls.Add(this.comboBox2);
184 186
            this.panel1.Controls.Add(this.label2);
185
            this.panel1.Location = new System.Drawing.Point(7, 50);
187
            this.panel1.Location = new System.Drawing.Point(5, 40);
186 188
            this.panel1.Name = "panel1";
187
            this.panel1.Size = new System.Drawing.Size(1399, 61);
189
            this.panel1.Size = new System.Drawing.Size(1330, 44);
188 190
            this.panel1.TabIndex = 6;
189 191
            // 
190
            // groupBoxEx1
191
            // 
192
            this.groupBoxEx1.BorderColor = System.Drawing.Color.Black;
193
            this.groupBoxEx1.Controls.Add(this.comboBox1);
194
            this.groupBoxEx1.Controls.Add(this.label1);
195
            this.groupBoxEx1.Controls.Add(this.radioButton2);
196
            this.groupBoxEx1.Controls.Add(this.radioButton1);
197
            this.groupBoxEx1.Location = new System.Drawing.Point(223, 13);
198
            this.groupBoxEx1.Name = "groupBoxEx1";
199
            this.groupBoxEx1.Size = new System.Drawing.Size(281, 38);
200
            this.groupBoxEx1.TabIndex = 31;
201
            this.groupBoxEx1.TabStop = false;
202
            // 
203
            // comboBox1
204
            // 
205
            this.comboBox1.BackColor = System.Drawing.Color.WhiteSmoke;
206
            this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
207
            this.comboBox1.DropDownWidth = 120;
208
            this.comboBox1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
209
            this.comboBox1.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
210
            this.comboBox1.FormattingEnabled = true;
211
            this.comboBox1.Location = new System.Drawing.Point(164, 7);
212
            this.comboBox1.Name = "comboBox1";
213
            this.comboBox1.Size = new System.Drawing.Size(59, 24);
214
            this.comboBox1.TabIndex = 32;
215
            this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
216
            // 
217
            // label1
218
            // 
219
            this.label1.AutoSize = true;
220
            this.label1.Location = new System.Drawing.Point(229, 12);
221
            this.label1.Name = "label1";
222
            this.label1.Size = new System.Drawing.Size(24, 15);
223
            this.label1.TabIndex = 0;
224
            this.label1.Text = "月";
225
            // 
226
            // radioButton2
227
            // 
228
            this.radioButton2.AutoSize = true;
229
            this.radioButton2.Location = new System.Drawing.Point(80, 10);
230
            this.radioButton2.Name = "radioButton2";
231
            this.radioButton2.Size = new System.Drawing.Size(76, 19);
232
            this.radioButton2.TabIndex = 23;
233
            this.radioButton2.TabStop = true;
234
            this.radioButton2.Text = "月指定";
235
            this.radioButton2.UseVisualStyleBackColor = true;
236
            this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton2_CheckedChanged);
237
            // 
238
            // radioButton1
239
            // 
240
            this.radioButton1.AutoSize = true;
241
            this.radioButton1.Location = new System.Drawing.Point(15, 10);
242
            this.radioButton1.Name = "radioButton1";
243
            this.radioButton1.Size = new System.Drawing.Size(59, 19);
244
            this.radioButton1.TabIndex = 22;
245
            this.radioButton1.TabStop = true;
246
            this.radioButton1.Text = "通年";
247
            this.radioButton1.UseVisualStyleBackColor = true;
248
            this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
249
            // 
250 192
            // label7
251 193
            // 
252 194
            this.label7.AutoSize = true;
253
            this.label7.Location = new System.Drawing.Point(190, 25);
195
            this.label7.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
196
            this.label7.Location = new System.Drawing.Point(238, 10);
254 197
            this.label7.Name = "label7";
255
            this.label7.Size = new System.Drawing.Size(24, 15);
198
            this.label7.Size = new System.Drawing.Size(25, 16);
256 199
            this.label7.TabIndex = 30;
257 200
            this.label7.Text = "期";
258 201
            // 
259 202
            // label6
260 203
            // 
261 204
            this.label6.AutoSize = true;
262
            this.label6.Location = new System.Drawing.Point(97, 25);
205
            this.label6.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
206
            this.label6.Location = new System.Drawing.Point(133, 10);
263 207
            this.label6.Name = "label6";
264
            this.label6.Size = new System.Drawing.Size(24, 15);
208
            this.label6.Size = new System.Drawing.Size(25, 16);
265 209
            this.label6.TabIndex = 29;
266 210
            this.label6.Text = "第";
267 211
            // 
268 212
            // numericUpDown2
269 213
            // 
270 214
            this.numericUpDown2.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
271
            this.numericUpDown2.Location = new System.Drawing.Point(126, 21);
215
            this.numericUpDown2.Location = new System.Drawing.Point(158, 7);
272 216
            this.numericUpDown2.Maximum = new decimal(new int[] {
273 217
            12,
274 218
            0,
......
280 224
            0,
281 225
            0});
282 226
            this.numericUpDown2.Name = "numericUpDown2";
283
            this.numericUpDown2.Size = new System.Drawing.Size(58, 23);
227
            this.numericUpDown2.Size = new System.Drawing.Size(80, 23);
284 228
            this.numericUpDown2.TabIndex = 28;
285 229
            this.numericUpDown2.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
286 230
            this.numericUpDown2.Value = new decimal(new int[] {
......
295 239
            this.label5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
296 240
            this.label5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
297 241
            this.label5.CausesValidation = false;
298
            this.label5.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
299
            this.label5.Location = new System.Drawing.Point(815, 17);
242
            this.label5.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
243
            this.label5.Location = new System.Drawing.Point(914, 5);
300 244
            this.label5.Name = "label5";
301
            this.label5.Size = new System.Drawing.Size(76, 30);
245
            this.label5.Size = new System.Drawing.Size(120, 27);
302 246
            this.label5.TabIndex = 27;
303 247
            this.label5.Text = "担当者";
304 248
            this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......
312 256
            this.comboBox3.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
313 257
            this.comboBox3.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
314 258
            this.comboBox3.FormattingEnabled = true;
315
            this.comboBox3.Location = new System.Drawing.Point(902, 20);
259
            this.comboBox3.Location = new System.Drawing.Point(1042, 6);
316 260
            this.comboBox3.Name = "comboBox3";
317 261
            this.comboBox3.Size = new System.Drawing.Size(194, 24);
318 262
            this.comboBox3.TabIndex = 26;
......
324 268
            this.label4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
325 269
            this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
326 270
            this.label4.CausesValidation = false;
327
            this.label4.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
328
            this.label4.Location = new System.Drawing.Point(524, 17);
271
            this.label4.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
272
            this.label4.Location = new System.Drawing.Point(576, 5);
329 273
            this.label4.Name = "label4";
330
            this.label4.Size = new System.Drawing.Size(69, 30);
274
            this.label4.Size = new System.Drawing.Size(120, 27);
331 275
            this.label4.TabIndex = 25;
332 276
            this.label4.Text = "部署";
333 277
            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......
341 285
            this.comboBox2.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
342 286
            this.comboBox2.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
343 287
            this.comboBox2.FormattingEnabled = true;
344
            this.comboBox2.Location = new System.Drawing.Point(608, 20);
288
            this.comboBox2.Location = new System.Drawing.Point(704, 6);
345 289
            this.comboBox2.Name = "comboBox2";
346 290
            this.comboBox2.Size = new System.Drawing.Size(194, 24);
347 291
            this.comboBox2.TabIndex = 24;
......
353 297
            this.label2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
354 298
            this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
355 299
            this.label2.CausesValidation = false;
356
            this.label2.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
357
            this.label2.Location = new System.Drawing.Point(5, 17);
300
            this.label2.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
301
            this.label2.Location = new System.Drawing.Point(5, 5);
358 302
            this.label2.Name = "label2";
359
            this.label2.Size = new System.Drawing.Size(80, 30);
303
            this.label2.Size = new System.Drawing.Size(120, 27);
360 304
            this.label2.TabIndex = 6;
361 305
            this.label2.Text = "営業期";
362 306
            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
......
367 311
            this.dgvMaster.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
368 312
            | System.Windows.Forms.AnchorStyles.Left) 
369 313
            | System.Windows.Forms.AnchorStyles.Right)));
370
            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
371
            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
372
            dataGridViewCellStyle1.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
373
            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
374
            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
375
            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
376
            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
377
            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
314
            dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
315
            dataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Control;
316
            dataGridViewCellStyle28.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
317
            dataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.WindowText;
318
            dataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight;
319
            dataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
320
            dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
321
            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle28;
378 322
            this.dgvMaster.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
379 323
            this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
380 324
            this.EditStatus,
......
455 399
            this.ApprovalDate_10,
456 400
            this.ApprovalOrder_10});
457 401
            this.dgvMaster.EnableHeadersVisualStyles = false;
458
            this.dgvMaster.Location = new System.Drawing.Point(8, 117);
402
            this.dgvMaster.Location = new System.Drawing.Point(5, 88);
459 403
            this.dgvMaster.Name = "dgvMaster";
404
            this.dgvMaster.RowHeadersVisible = false;
460 405
            this.dgvMaster.RowHeadersWidth = 24;
461 406
            this.dgvMaster.RowTemplate.Height = 21;
462
            this.dgvMaster.Size = new System.Drawing.Size(1399, 474);
407
            this.dgvMaster.Size = new System.Drawing.Size(1330, 502);
463 408
            this.dgvMaster.TabIndex = 7;
464 409
            // 
465 410
            // EditStatus
466 411
            // 
467
            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
468
            this.EditStatus.DefaultCellStyle = dataGridViewCellStyle2;
412
            dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
413
            this.EditStatus.DefaultCellStyle = dataGridViewCellStyle29;
469 414
            this.EditStatus.HeaderText = "■編集状態";
470 415
            this.EditStatus.Name = "EditStatus";
471 416
            this.EditStatus.Visible = false;
472 417
            // 
473 418
            // No
474 419
            // 
475
            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
476
            this.No.DefaultCellStyle = dataGridViewCellStyle3;
420
            dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
421
            this.No.DefaultCellStyle = dataGridViewCellStyle30;
477 422
            this.No.HeaderText = "No.";
478 423
            this.No.Name = "No";
479 424
            this.No.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
512 457
            // 
513 458
            // DepositDate
514 459
            // 
515
            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
516
            this.DepositDate.DefaultCellStyle = dataGridViewCellStyle4;
460
            dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
461
            this.DepositDate.DefaultCellStyle = dataGridViewCellStyle31;
517 462
            this.DepositDate.HeaderText = "入金日";
518 463
            this.DepositDate.Name = "DepositDate";
519 464
            this.DepositDate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
521 466
            // 
522 467
            // DepositAmountCash
523 468
            // 
524
            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
525
            this.DepositAmountCash.DefaultCellStyle = dataGridViewCellStyle5;
469
            dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
470
            this.DepositAmountCash.DefaultCellStyle = dataGridViewCellStyle32;
526 471
            this.DepositAmountCash.HeaderText = "入金金額\r\n(振込)";
527 472
            this.DepositAmountCash.Name = "DepositAmountCash";
528 473
            this.DepositAmountCash.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
530 475
            // 
531 476
            // DepositAmountBill
532 477
            // 
533
            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
534
            this.DepositAmountBill.DefaultCellStyle = dataGridViewCellStyle6;
478
            dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
479
            this.DepositAmountBill.DefaultCellStyle = dataGridViewCellStyle33;
535 480
            this.DepositAmountBill.HeaderText = "入金金額\r\n(手形)";
536 481
            this.DepositAmountBill.Name = "DepositAmountBill";
537 482
            this.DepositAmountBill.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
564 509
            // 
565 510
            // PaymentSchedule
566 511
            // 
567
            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
568
            this.PaymentSchedule.DefaultCellStyle = dataGridViewCellStyle7;
512
            dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
513
            this.PaymentSchedule.DefaultCellStyle = dataGridViewCellStyle34;
569 514
            this.PaymentSchedule.HeaderText = "入金\r\n予定日";
570 515
            this.PaymentSchedule.Name = "PaymentSchedule";
571 516
            this.PaymentSchedule.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
574 519
            // 
575 520
            // BillCreationDate
576 521
            // 
577
            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
578
            this.BillCreationDate.DefaultCellStyle = dataGridViewCellStyle8;
522
            dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
523
            this.BillCreationDate.DefaultCellStyle = dataGridViewCellStyle35;
579 524
            this.BillCreationDate.HeaderText = "請求日";
580 525
            this.BillCreationDate.Name = "BillCreationDate";
581 526
            this.BillCreationDate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
584 529
            // 
585 530
            // BillPrice
586 531
            // 
587
            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
588
            this.BillPrice.DefaultCellStyle = dataGridViewCellStyle9;
532
            dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
533
            this.BillPrice.DefaultCellStyle = dataGridViewCellStyle36;
589 534
            this.BillPrice.HeaderText = "請求金額\r\n(税抜)";
590 535
            this.BillPrice.Name = "BillPrice";
591 536
            this.BillPrice.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
594 539
            // 
595 540
            // TaxPrice
596 541
            // 
597
            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
598
            this.TaxPrice.DefaultCellStyle = dataGridViewCellStyle10;
542
            dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
543
            this.TaxPrice.DefaultCellStyle = dataGridViewCellStyle37;
599 544
            this.TaxPrice.HeaderText = "請求金額\r\n(消費税)";
600 545
            this.TaxPrice.Name = "TaxPrice";
601 546
            this.TaxPrice.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
604 549
            // 
605 550
            // DepositAmount
606 551
            // 
607
            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
608
            this.DepositAmount.DefaultCellStyle = dataGridViewCellStyle11;
552
            dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
553
            this.DepositAmount.DefaultCellStyle = dataGridViewCellStyle38;
609 554
            this.DepositAmount.HeaderText = "入金金額";
610 555
            this.DepositAmount.Name = "DepositAmount";
611 556
            this.DepositAmount.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
613 558
            // 
614 559
            // DiscountAmount
615 560
            // 
616
            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
617
            this.DiscountAmount.DefaultCellStyle = dataGridViewCellStyle12;
561
            dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
562
            this.DiscountAmount.DefaultCellStyle = dataGridViewCellStyle39;
618 563
            this.DiscountAmount.HeaderText = "値引金額";
619 564
            this.DiscountAmount.Name = "DiscountAmount";
620 565
            this.DiscountAmount.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
622 567
            // 
623 568
            // CnstrPrice
624 569
            // 
625
            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
626
            this.CnstrPrice.DefaultCellStyle = dataGridViewCellStyle13;
570
            dataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
571
            this.CnstrPrice.DefaultCellStyle = dataGridViewCellStyle40;
627 572
            this.CnstrPrice.HeaderText = "協力金";
628 573
            this.CnstrPrice.Name = "CnstrPrice";
629 574
            this.CnstrPrice.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
631 576
            // 
632 577
            // Fees
633 578
            // 
634
            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
635
            this.Fees.DefaultCellStyle = dataGridViewCellStyle14;
579
            dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
580
            this.Fees.DefaultCellStyle = dataGridViewCellStyle41;
636 581
            this.Fees.HeaderText = "手数料";
637 582
            this.Fees.Name = "Fees";
638 583
            this.Fees.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
640 585
            // 
641 586
            // OtherAdjustments
642 587
            // 
643
            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
644
            this.OtherAdjustments.DefaultCellStyle = dataGridViewCellStyle15;
588
            dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
589
            this.OtherAdjustments.DefaultCellStyle = dataGridViewCellStyle42;
645 590
            this.OtherAdjustments.HeaderText = "その他調整";
646 591
            this.OtherAdjustments.Name = "OtherAdjustments";
647 592
            this.OtherAdjustments.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
649 594
            // 
650 595
            // CarryAmount
651 596
            // 
652
            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
653
            this.CarryAmount.DefaultCellStyle = dataGridViewCellStyle16;
597
            dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
598
            this.CarryAmount.DefaultCellStyle = dataGridViewCellStyle43;
654 599
            this.CarryAmount.HeaderText = "次回繰越";
655 600
            this.CarryAmount.Name = "CarryAmount";
656 601
            this.CarryAmount.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
658 603
            // 
659 604
            // PersonName
660 605
            // 
661
            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
662
            this.PersonName.DefaultCellStyle = dataGridViewCellStyle17;
606
            dataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
607
            this.PersonName.DefaultCellStyle = dataGridViewCellStyle44;
663 608
            this.PersonName.HeaderText = "担当者\r\n承認";
664 609
            this.PersonName.Name = "PersonName";
665 610
            this.PersonName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
679 624
            // 
680 625
            // ApprovalName_1
681 626
            // 
682
            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
683
            this.ApprovalName_1.DefaultCellStyle = dataGridViewCellStyle18;
627
            dataGridViewCellStyle45.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
628
            this.ApprovalName_1.DefaultCellStyle = dataGridViewCellStyle45;
684 629
            this.ApprovalName_1.HeaderText = "承認者1\r\n承認";
685 630
            this.ApprovalName_1.Name = "ApprovalName_1";
686 631
            this.ApprovalName_1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
713 658
            // 
714 659
            // ApprovalName_2
715 660
            // 
716
            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
717
            this.ApprovalName_2.DefaultCellStyle = dataGridViewCellStyle19;
661
            dataGridViewCellStyle46.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
662
            this.ApprovalName_2.DefaultCellStyle = dataGridViewCellStyle46;
718 663
            this.ApprovalName_2.HeaderText = "承認者2\r\n承認";
719 664
            this.ApprovalName_2.Name = "ApprovalName_2";
720 665
            this.ApprovalName_2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
747 692
            // 
748 693
            // ApprovalName_3
749 694
            // 
750
            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
751
            this.ApprovalName_3.DefaultCellStyle = dataGridViewCellStyle20;
695
            dataGridViewCellStyle47.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
696
            this.ApprovalName_3.DefaultCellStyle = dataGridViewCellStyle47;
752 697
            this.ApprovalName_3.HeaderText = "承認者3\r\n承認";
753 698
            this.ApprovalName_3.Name = "ApprovalName_3";
754 699
            this.ApprovalName_3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
781 726
            // 
782 727
            // ApprovalName_4
783 728
            // 
784
            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
785
            this.ApprovalName_4.DefaultCellStyle = dataGridViewCellStyle21;
729
            dataGridViewCellStyle48.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
730
            this.ApprovalName_4.DefaultCellStyle = dataGridViewCellStyle48;
786 731
            this.ApprovalName_4.HeaderText = "承認者4\r\n承認";
787 732
            this.ApprovalName_4.Name = "ApprovalName_4";
788 733
            this.ApprovalName_4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
815 760
            // 
816 761
            // ApprovalName_5
817 762
            // 
818
            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
819
            this.ApprovalName_5.DefaultCellStyle = dataGridViewCellStyle22;
763
            dataGridViewCellStyle49.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
764
            this.ApprovalName_5.DefaultCellStyle = dataGridViewCellStyle49;
820 765
            this.ApprovalName_5.HeaderText = "承認者5\r\n承認";
821 766
            this.ApprovalName_5.Name = "ApprovalName_5";
822 767
            this.ApprovalName_5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
849 794
            // 
850 795
            // ApprovalName_6
851 796
            // 
852
            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
853
            this.ApprovalName_6.DefaultCellStyle = dataGridViewCellStyle23;
797
            dataGridViewCellStyle50.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
798
            this.ApprovalName_6.DefaultCellStyle = dataGridViewCellStyle50;
854 799
            this.ApprovalName_6.HeaderText = "承認者6\r\n承認";
855 800
            this.ApprovalName_6.Name = "ApprovalName_6";
856 801
            this.ApprovalName_6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
883 828
            // 
884 829
            // ApprovalName_7
885 830
            // 
886
            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
887
            this.ApprovalName_7.DefaultCellStyle = dataGridViewCellStyle24;
831
            dataGridViewCellStyle51.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
832
            this.ApprovalName_7.DefaultCellStyle = dataGridViewCellStyle51;
888 833
            this.ApprovalName_7.HeaderText = "承認者7\r\n承認";
889 834
            this.ApprovalName_7.Name = "ApprovalName_7";
890 835
            this.ApprovalName_7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
917 862
            // 
918 863
            // ApprovalName_8
919 864
            // 
920
            dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
921
            this.ApprovalName_8.DefaultCellStyle = dataGridViewCellStyle25;
865
            dataGridViewCellStyle52.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
866
            this.ApprovalName_8.DefaultCellStyle = dataGridViewCellStyle52;
922 867
            this.ApprovalName_8.HeaderText = "承認者8\r\n承認";
923 868
            this.ApprovalName_8.Name = "ApprovalName_8";
924 869
            this.ApprovalName_8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
951 896
            // 
952 897
            // ApprovalName_9
953 898
            // 
954
            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
955
            this.ApprovalName_9.DefaultCellStyle = dataGridViewCellStyle26;
899
            dataGridViewCellStyle53.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
900
            this.ApprovalName_9.DefaultCellStyle = dataGridViewCellStyle53;
956 901
            this.ApprovalName_9.HeaderText = "承認者9\r\n承認";
957 902
            this.ApprovalName_9.Name = "ApprovalName_9";
958 903
            this.ApprovalName_9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
985 930
            // 
986 931
            // ApprovalName_10
987 932
            // 
988
            dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
989
            this.ApprovalName_10.DefaultCellStyle = dataGridViewCellStyle27;
933
            dataGridViewCellStyle54.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
934
            this.ApprovalName_10.DefaultCellStyle = dataGridViewCellStyle54;
990 935
            this.ApprovalName_10.HeaderText = "承認者10\r\n承認";
991 936
            this.ApprovalName_10.Name = "ApprovalName_10";
992 937
            this.ApprovalName_10.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
1020 965
            // btnEnd
1021 966
            // 
1022 967
            this.btnEnd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
1023
            this.btnEnd.BackColor = System.Drawing.Color.Magenta;
968
            this.btnEnd.BackColor = System.Drawing.Color.Blue;
1024 969
            this.btnEnd.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1025
            this.btnEnd.ForeColor = System.Drawing.Color.Black;
1026
            this.btnEnd.Location = new System.Drawing.Point(1287, 597);
970
            this.btnEnd.ForeColor = System.Drawing.Color.White;
971
            this.btnEnd.Location = new System.Drawing.Point(1214, 625);
1027 972
            this.btnEnd.Name = "btnEnd";
1028 973
            this.btnEnd.Size = new System.Drawing.Size(120, 30);
1029 974
            this.btnEnd.TabIndex = 20;
......
1031 976
            this.btnEnd.UseVisualStyleBackColor = false;
1032 977
            this.btnEnd.Click += new System.EventHandler(this.btnEnd_Click);
1033 978
            // 
979
            // groupBoxEx1
980
            // 
981
            this.groupBoxEx1.BorderColor = System.Drawing.Color.Black;
982
            this.groupBoxEx1.Controls.Add(this.comboBox1);
983
            this.groupBoxEx1.Controls.Add(this.label8);
984
            this.groupBoxEx1.Controls.Add(this.radioButton2);
985
            this.groupBoxEx1.Controls.Add(this.radioButton1);
986
            this.groupBoxEx1.Location = new System.Drawing.Point(289, 2);
987
            this.groupBoxEx1.Name = "groupBoxEx1";
988
            this.groupBoxEx1.Size = new System.Drawing.Size(280, 36);
989
            this.groupBoxEx1.TabIndex = 32;
990
            this.groupBoxEx1.TabStop = false;
991
            // 
992
            // comboBox1
993
            // 
994
            this.comboBox1.BackColor = System.Drawing.Color.WhiteSmoke;
995
            this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
996
            this.comboBox1.DropDownWidth = 120;
997
            this.comboBox1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
998
            this.comboBox1.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
999
            this.comboBox1.FormattingEnabled = true;
1000
            this.comboBox1.Location = new System.Drawing.Point(164, 7);
1001
            this.comboBox1.Name = "comboBox1";
1002
            this.comboBox1.Size = new System.Drawing.Size(59, 24);
1003
            this.comboBox1.TabIndex = 32;
1004
            this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
1005
            // 
1006
            // label8
1007
            // 
1008
            this.label8.AutoSize = true;
1009
            this.label8.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1010
            this.label8.Location = new System.Drawing.Point(229, 12);
1011
            this.label8.Name = "label8";
1012
            this.label8.Size = new System.Drawing.Size(25, 16);
1013
            this.label8.TabIndex = 0;
1014
            this.label8.Text = "月";
1015
            // 
1016
            // radioButton2
1017
            // 
1018
            this.radioButton2.AutoSize = true;
1019
            this.radioButton2.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1020
            this.radioButton2.Location = new System.Drawing.Point(80, 10);
1021
            this.radioButton2.Name = "radioButton2";
1022
            this.radioButton2.Size = new System.Drawing.Size(77, 20);
1023
            this.radioButton2.TabIndex = 23;
1024
            this.radioButton2.TabStop = true;
1025
            this.radioButton2.Text = "月指定";
1026
            this.radioButton2.UseVisualStyleBackColor = true;
1027
            this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton2_CheckedChanged);
1028
            // 
1029
            // radioButton1
1030
            // 
1031
            this.radioButton1.AutoSize = true;
1032
            this.radioButton1.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1033
            this.radioButton1.Location = new System.Drawing.Point(15, 10);
1034
            this.radioButton1.Name = "radioButton1";
1035
            this.radioButton1.Size = new System.Drawing.Size(60, 20);
1036
            this.radioButton1.TabIndex = 22;
1037
            this.radioButton1.TabStop = true;
1038
            this.radioButton1.Text = "通年";
1039
            this.radioButton1.UseVisualStyleBackColor = true;
1040
            this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged);
1041
            // 
1034 1042
            // FrmSalesConfirm
1035 1043
            // 
1036 1044
            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 15F);
1037 1045
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
1038 1046
            this.BackColor = System.Drawing.Color.Black;
1039
            this.ClientSize = new System.Drawing.Size(1417, 633);
1047
            this.ClientSize = new System.Drawing.Size(1344, 661);
1040 1048
            this.Controls.Add(this.btnEnd);
1041 1049
            this.Controls.Add(this.dgvMaster);
1042 1050
            this.Controls.Add(this.panel1);
......
1049 1057
            this.Load += new System.EventHandler(this.FrmSalesConfirm_Load);
1050 1058
            this.panel1.ResumeLayout(false);
1051 1059
            this.panel1.PerformLayout();
1060
            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit();
1061
            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).EndInit();
1052 1062
            this.groupBoxEx1.ResumeLayout(false);
1053 1063
            this.groupBoxEx1.PerformLayout();
1054
            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit();
1055
            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).EndInit();
1056 1064
            this.ResumeLayout(false);
1057 1065

  
1058 1066
        }
......
1068 1076
        private System.Windows.Forms.ComboBox comboBox3;
1069 1077
        private System.Windows.Forms.Label label4;
1070 1078
        private System.Windows.Forms.ComboBox comboBox2;
1071
        private System.Windows.Forms.Label label1;
1072
        private System.Windows.Forms.RadioButton radioButton2;
1073
        private System.Windows.Forms.RadioButton radioButton1;
1074 1079
        private System.Windows.Forms.NumericUpDown numericUpDown2;
1075 1080
        private System.Windows.Forms.Label label7;
1076 1081
        private System.Windows.Forms.Label label6;
1077
        private CustomControls.GroupBoxEx groupBoxEx1;
1078
        private System.Windows.Forms.ComboBox comboBox1;
1079 1082
        private System.Windows.Forms.DataGridViewTextBoxColumn EditStatus;
1080 1083
        private System.Windows.Forms.DataGridViewTextBoxColumn No;
1081 1084
        private System.Windows.Forms.DataGridViewTextBoxColumn OrderersDivision;
......
1153 1156
        private System.Windows.Forms.DataGridViewTextBoxColumn ApprovalAuthority_10;
1154 1157
        private System.Windows.Forms.DataGridViewTextBoxColumn ApprovalDate_10;
1155 1158
        private System.Windows.Forms.DataGridViewTextBoxColumn ApprovalOrder_10;
1159
        private CustomControls.GroupBoxEx groupBoxEx1;
1160
        private System.Windows.Forms.ComboBox comboBox1;
1161
        private System.Windows.Forms.Label label8;
1162
        private System.Windows.Forms.RadioButton radioButton2;
1163
        private System.Windows.Forms.RadioButton radioButton1;
1156 1164
    }
1157 1165
}
1158 1166

  
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirm.cs
1828 1828
        #endregion
1829 1829
        #endregion
1830 1830

  
1831
        #region イベント
1832

  
1833 1831
        #region 終了ボタンクリック時のイベント
1834 1832
        /// <summary>
1835 1833
        /// 終了ボタンクリック時のイベント
......
1958 1956
            DisplayData();
1959 1957
        }
1960 1958
        #endregion
1961
        #endregion
1962

  
1963 1959
    }
1964 1960
}
branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmPriceOfBudget.Designer.cs
30 30
        {
31 31
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
32 32
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
34 34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
35 35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
36 36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
......
41 41
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
42 42
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
43 43
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
44
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
44 45
            this.btnEnd = new System.Windows.Forms.Button();
45 46
            this.groupBox1 = new System.Windows.Forms.GroupBox();
46 47
            this.cmbDepartment = new System.Windows.Forms.ComboBox();
......
53 54
            this.label5 = new System.Windows.Forms.Label();
54 55
            this.lblCellTotal = new System.Windows.Forms.Label();
55 56
            this.dgvMain = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
56
            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
57
            this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn();
58
            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
59
            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
60
            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
61
            this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn();
62
            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
63
            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
57
            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
58
            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
59
            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
60
            this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
61
            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
62
            this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
64 63
            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
65 64
            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
65
            this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
66
            this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
67
            this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
66 68
            this.groupBox1.SuspendLayout();
67 69
            ((System.ComponentModel.ISupportInitialize)(this.numUDConstPro)).BeginInit();
68 70
            ((System.ComponentModel.ISupportInitialize)(this.dgvMain)).BeginInit();
......
73 75
            this.btnEnd.BackColor = System.Drawing.Color.Blue;
74 76
            this.btnEnd.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
75 77
            this.btnEnd.ForeColor = System.Drawing.Color.White;
76
            this.btnEnd.Location = new System.Drawing.Point(887, 550);
78
            this.btnEnd.Location = new System.Drawing.Point(1007, 550);
77 79
            this.btnEnd.Name = "btnEnd";
78 80
            this.btnEnd.Size = new System.Drawing.Size(120, 30);
79 81
            this.btnEnd.TabIndex = 3;
......
96 98
            this.groupBox1.ForeColor = System.Drawing.Color.White;
97 99
            this.groupBox1.Location = new System.Drawing.Point(7, 5);
98 100
            this.groupBox1.Name = "groupBox1";
99
            this.groupBox1.Size = new System.Drawing.Size(1000, 41);
101
            this.groupBox1.Size = new System.Drawing.Size(1120, 41);
100 102
            this.groupBox1.TabIndex = 51;
101 103
            this.groupBox1.TabStop = false;
102 104
            // 
......
233 235
            this.dgvMain.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
234 236
            this.dgvMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
235 237
            this.dgvMain.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
236
            this.dataGridViewTextBoxColumn1,
237
            this.Column14,
238
            this.dataGridViewTextBoxColumn2,
239
            this.dataGridViewTextBoxColumn3,
240
            this.dataGridViewTextBoxColumn4,
241
            this.Column15,
242
            this.dataGridViewTextBoxColumn5,
243
            this.dataGridViewTextBoxColumn6,
238
            this.Column1,
239
            this.Column2,
240
            this.Column3,
241
            this.Column4,
242
            this.Column5,
243
            this.Column6,
244 244
            this.Column7,
245
            this.Column8});
246
            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
247
            dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window;
248
            dataGridViewCellStyle13.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold);
249
            dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText;
250
            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
251
            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
252
            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
253
            this.dgvMain.DefaultCellStyle = dataGridViewCellStyle13;
245
            this.Column8,
246
            this.Column9,
247
            this.Column10,
248
            this.Column11});
249
            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
250
            dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Window;
251
            dataGridViewCellStyle14.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold);
252
            dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.ControlText;
253
            dataGridViewCellStyle14.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
254
            dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
255
            dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
256
            this.dgvMain.DefaultCellStyle = dataGridViewCellStyle14;
254 257
            this.dgvMain.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
255 258
            this.dgvMain.Location = new System.Drawing.Point(7, 50);
256 259
            this.dgvMain.Name = "dgvMain";
......
259 262
            this.dgvMain.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
260 263
            this.dgvMain.RowTemplate.Height = 21;
261 264
            this.dgvMain.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
262
            this.dgvMain.Size = new System.Drawing.Size(1000, 496);
265
            this.dgvMain.Size = new System.Drawing.Size(1120, 496);
263 266
            this.dgvMain.TabIndex = 52;
264 267
            this.dgvMain.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMain_CellDoubleClick);
268
            this.dgvMain.SelectionChanged += new System.EventHandler(this.dgvMain_SelectionChanged);
265 269
            this.dgvMain.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgvMain_MouseUp);
266 270
            // 
267
            // dataGridViewTextBoxColumn1
271
            // Column1
268 272
            // 
269 273
            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
270 274
            dataGridViewCellStyle3.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
271
            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle3;
272
            this.dataGridViewTextBoxColumn1.Frozen = true;
273
            this.dataGridViewTextBoxColumn1.HeaderText = "№";
274
            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
275
            this.dataGridViewTextBoxColumn1.ReadOnly = true;
276
            this.dataGridViewTextBoxColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
277
            this.dataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
278
            this.dataGridViewTextBoxColumn1.Width = 50;
275
            this.Column1.DefaultCellStyle = dataGridViewCellStyle3;
276
            this.Column1.Frozen = true;
277
            this.Column1.HeaderText = "№";
278
            this.Column1.Name = "Column1";
279
            this.Column1.ReadOnly = true;
280
            this.Column1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
281
            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
282
            this.Column1.Width = 50;
279 283
            // 
280
            // Column14
284
            // Column2
281 285
            // 
282 286
            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
283 287
            dataGridViewCellStyle4.Font = new System.Drawing.Font("MS P明朝", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
284
            this.Column14.DefaultCellStyle = dataGridViewCellStyle4;
285
            this.Column14.Frozen = true;
286
            this.Column14.HeaderText = "部署";
287
            this.Column14.Name = "Column14";
288
            this.Column14.ReadOnly = true;
288
            this.Column2.DefaultCellStyle = dataGridViewCellStyle4;
289
            this.Column2.Frozen = true;
290
            this.Column2.HeaderText = "部署";
291
            this.Column2.Name = "Column2";
292
            this.Column2.ReadOnly = true;
289 293
            // 
290
            // dataGridViewTextBoxColumn2
294
            // Column3
291 295
            // 
292 296
            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
293 297
            dataGridViewCellStyle5.Font = new System.Drawing.Font("MS P明朝", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
294
            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle5;
295
            this.dataGridViewTextBoxColumn2.Frozen = true;
296
            this.dataGridViewTextBoxColumn2.HeaderText = "担当者名";
297
            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
298
            this.dataGridViewTextBoxColumn2.ReadOnly = true;
299
            this.dataGridViewTextBoxColumn2.Resizable = System.Windows.Forms.DataGridViewTriState.False;
300
            this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
298
            this.Column3.DefaultCellStyle = dataGridViewCellStyle5;
299
            this.Column3.Frozen = true;
300
            this.Column3.HeaderText = "担当者名";
301
            this.Column3.Name = "Column3";
302
            this.Column3.ReadOnly = true;
303
            this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
304
            this.Column3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
301 305
            // 
302
            // dataGridViewTextBoxColumn3
306
            // Column4
303 307
            // 
304 308
            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
305
            this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle6;
306
            this.dataGridViewTextBoxColumn3.Frozen = true;
307
            this.dataGridViewTextBoxColumn3.HeaderText = "工事コード";
308
            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
309
            this.dataGridViewTextBoxColumn3.ReadOnly = true;
310
            this.dataGridViewTextBoxColumn3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
311
            this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
312
            this.dataGridViewTextBoxColumn3.Visible = false;
313
            this.dataGridViewTextBoxColumn3.Width = 5;
309
            this.Column4.DefaultCellStyle = dataGridViewCellStyle6;
310
            this.Column4.Frozen = true;
311
            this.Column4.HeaderText = "工事コード";
312
            this.Column4.Name = "Column4";
313
            this.Column4.ReadOnly = true;
314
            this.Column4.Resizable = System.Windows.Forms.DataGridViewTriState.False;
315
            this.Column4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
316
            this.Column4.Visible = false;
317
            this.Column4.Width = 5;
314 318
            // 
315
            // dataGridViewTextBoxColumn4
319
            // Column5
316 320
            // 
317 321
            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
318 322
            dataGridViewCellStyle7.Font = new System.Drawing.Font("MS P明朝", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
319
            this.dataGridViewTextBoxColumn4.DefaultCellStyle = dataGridViewCellStyle7;
320
            this.dataGridViewTextBoxColumn4.Frozen = true;
321
            this.dataGridViewTextBoxColumn4.HeaderText = "工 事 名 称";
322
            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
323
            this.dataGridViewTextBoxColumn4.ReadOnly = true;
324
            this.dataGridViewTextBoxColumn4.Resizable = System.Windows.Forms.DataGridViewTriState.False;
325
            this.dataGridViewTextBoxColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
326
            this.dataGridViewTextBoxColumn4.Width = 230;
323
            this.Column5.DefaultCellStyle = dataGridViewCellStyle7;
324
            this.Column5.Frozen = true;
325
            this.Column5.HeaderText = "工 事 名 称";
326
            this.Column5.Name = "Column5";
327
            this.Column5.ReadOnly = true;
328
            this.Column5.Resizable = System.Windows.Forms.DataGridViewTriState.False;
329
            this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
330
            this.Column5.Width = 230;
327 331
            // 
328
            // Column15
332
            // Column6
329 333
            // 
330 334
            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
331
            dataGridViewCellStyle8.Font = new System.Drawing.Font("MS 明朝", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
332
            this.Column15.DefaultCellStyle = dataGridViewCellStyle8;
333
            this.Column15.Frozen = true;
334
            this.Column15.HeaderText = "状 態";
335
            this.Column15.Name = "Column15";
336
            this.Column15.ReadOnly = true;
337
            this.Column15.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
338
            this.Column15.Width = 80;
335
            dataGridViewCellStyle8.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
336
            this.Column6.DefaultCellStyle = dataGridViewCellStyle8;
337
            this.Column6.Frozen = true;
338
            this.Column6.HeaderText = "受注日";
339
            this.Column6.Name = "Column6";
340
            this.Column6.ReadOnly = true;
341
            this.Column6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
339 342
            // 
340
            // dataGridViewTextBoxColumn5
343
            // Column7
341 344
            // 
342
            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
343
            dataGridViewCellStyle9.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
344
            this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle9;
345
            this.dataGridViewTextBoxColumn5.Frozen = true;
346
            this.dataGridViewTextBoxColumn5.HeaderText = "受注金額";
347
            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
348
            this.dataGridViewTextBoxColumn5.ReadOnly = true;
349
            this.dataGridViewTextBoxColumn5.Resizable = System.Windows.Forms.DataGridViewTriState.False;
350
            this.dataGridViewTextBoxColumn5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
351
            this.dataGridViewTextBoxColumn5.Width = 120;
345
            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
346
            dataGridViewCellStyle9.Font = new System.Drawing.Font("MS 明朝", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
347
            this.Column7.DefaultCellStyle = dataGridViewCellStyle9;
348
            this.Column7.Frozen = true;
349
            this.Column7.HeaderText = "状 態";
350
            this.Column7.Name = "Column7";
351
            this.Column7.ReadOnly = true;
352
            this.Column7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
352 353
            // 
353
            // dataGridViewTextBoxColumn6
354
            // Column8
354 355
            // 
355 356
            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
356 357
            dataGridViewCellStyle10.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
357
            this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle10;
358
            this.dataGridViewTextBoxColumn6.HeaderText = "会社経費";
359
            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
360
            this.dataGridViewTextBoxColumn6.ReadOnly = true;
361
            this.dataGridViewTextBoxColumn6.Resizable = System.Windows.Forms.DataGridViewTriState.False;
362
            this.dataGridViewTextBoxColumn6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
358
            this.Column8.DefaultCellStyle = dataGridViewCellStyle10;
359
            this.Column8.Frozen = true;
360
            this.Column8.HeaderText = "受注金額";
361
            this.Column8.Name = "Column8";
362
            this.Column8.ReadOnly = true;
363
            this.Column8.Resizable = System.Windows.Forms.DataGridViewTriState.False;
364
            this.Column8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
365
            this.Column8.Width = 120;
363 366
            // 
364
            // Column7
367
            // Column9
365 368
            // 
366 369
            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
367 370
            dataGridViewCellStyle11.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
368
            this.Column7.DefaultCellStyle = dataGridViewCellStyle11;
369
            this.Column7.HeaderText = "部署経費";
370
            this.Column7.Name = "Column7";
371
            this.Column7.ReadOnly = true;
372
            this.Column7.Resizable = System.Windows.Forms.DataGridViewTriState.False;
373
            this.Column7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
371
            this.Column9.DefaultCellStyle = dataGridViewCellStyle11;
372
            this.Column9.HeaderText = "会社経費";
373
            this.Column9.Name = "Column9";
374
            this.Column9.ReadOnly = true;
375
            this.Column9.Resizable = System.Windows.Forms.DataGridViewTriState.False;
376
            this.Column9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
374 377
            // 
375
            // Column8
378
            // Column10
376 379
            // 
377 380
            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
378 381
            dataGridViewCellStyle12.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
379
            this.Column8.DefaultCellStyle = dataGridViewCellStyle12;
380
            this.Column8.HeaderText = "営業経費";
381
            this.Column8.Name = "Column8";
382
            this.Column8.ReadOnly = true;
383
            this.Column8.Resizable = System.Windows.Forms.DataGridViewTriState.False;
384
            this.Column8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
382
            this.Column10.DefaultCellStyle = dataGridViewCellStyle12;
383
            this.Column10.HeaderText = "部署経費";
384
            this.Column10.Name = "Column10";
385
            this.Column10.ReadOnly = true;
386
            this.Column10.Resizable = System.Windows.Forms.DataGridViewTriState.False;
387
            this.Column10.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
385 388
            // 
389
            // Column11
390
            // 
391
            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
392
            dataGridViewCellStyle13.Font = new System.Drawing.Font("Century", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
393
            this.Column11.DefaultCellStyle = dataGridViewCellStyle13;
394
            this.Column11.HeaderText = "営業経費";
395
            this.Column11.Name = "Column11";
396
            this.Column11.ReadOnly = true;
397
            this.Column11.Resizable = System.Windows.Forms.DataGridViewTriState.False;
398
            this.Column11.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
399
            // 
386 400
            // FrmPriceOfBudget
387 401
            // 
388 402
            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
389 403
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
390 404
            this.BackColor = System.Drawing.Color.Black;
391
            this.ClientSize = new System.Drawing.Size(1014, 584);
405
            this.ClientSize = new System.Drawing.Size(1134, 584);
392 406
            this.Controls.Add(this.lblCellTotal);
393 407
            this.Controls.Add(this.dgvMain);
394 408
            this.Controls.Add(this.groupBox1);
......
424 438
        private System.Windows.Forms.Label label3;
425 439
        private System.Windows.Forms.Label label5;
426 440
        private CustomControls.DataGridViewEX dgvMain;
427
        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
428
        private System.Windows.Forms.DataGridViewTextBoxColumn Column14;
429
        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
430
        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
431
        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
432
        private System.Windows.Forms.DataGridViewTextBoxColumn Column15;
433
        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
434
        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
441
        private System.Windows.Forms.Label lblCellTotal;
442
        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
443
        private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
444
        private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
445
        private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
446
        private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
447
        private System.Windows.Forms.DataGridViewTextBoxColumn Column6;
435 448
        private System.Windows.Forms.DataGridViewTextBoxColumn Column7;
436 449
        private System.Windows.Forms.DataGridViewTextBoxColumn Column8;
437
        private System.Windows.Forms.Label lblCellTotal;
450
        private System.Windows.Forms.DataGridViewTextBoxColumn Column9;
451
        private System.Windows.Forms.DataGridViewTextBoxColumn Column10;
452
        private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
438 453
    }
439 454
}
branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmPriceOfBudget.cs
37 37
            PersonName,
38 38
            ConstrCode,
39 39
            ConstrName,
40
            OrderDate,
40 41
            ConnstrStatus,
41 42
            OrdersPrice,
42 43
            CompanyExpeses,
......
97 98
                                                                    "**  総  合  計  **",
98 99
                                                                };
99 100
        #endregion
101

  
102
        #region 行選択色
103
        /// <summary>
104
        /// 行選択色
105
        /// </summary>
106
        private static Color s_RowSelectForeColor = Color.White;
107
        private static Color s_RowSelectBackColor = Color.Blue;
100 108
        #endregion
109
        #endregion
101 110

  
102 111
        #region 変数
103 112
        /// <summary>
......
439 448
            /// 担当者表示順
440 449
            /// </summary>
441 450
            PersonDisplayOrder,
451
            /// <summary>
452
            /// 受注日
453
            /// </summary>
454
            OrderDate,
442 455
        }
443 456
        #endregion
444 457

  
......
470 483
                strSQL += " A.CONSTRUCTIONSTATUSFLG, A.CONSTRUCTIONPERSONCODE,";
471 484
                strSQL += " C1.DEPARTMENTSTRING, B1.PERSONNAME,";
472 485
                strSQL += " D1.EXPENSESRAITO, D2.EXPENSESRAITO, D3.EXPENSESRAITO,";
473
                strSQL += " E1.DETAILSTRING, B1.DISPLAYORDER";
486
                strSQL += " E1.DETAILSTRING, B1.DISPLAYORDER,";
487
                strSQL += " A.ORDERDATE";
474 488
                strSQL += " FROM CONSTRUCTIONBASEINFO A, PERSONINCHARGEMASTER B1, DEPARTMENTMASTER C1";
475 489
                strSQL += string.Format(" LEFT JOIN DEPARTMENTEXPENSESMASTER D1 ON D1.DEPARTMENTCODE = C1.DEPARTMENTCODE AND D1.EXPENSESPERIOD = {0} AND D1.NameCode = 3", SelectPeriod);
476 490
                strSQL += string.Format(" LEFT JOIN DEPARTMENTEXPENSESMASTER D2 ON D2.DEPARTMENTCODE = C1.DEPARTMENTCODE AND D2.EXPENSESPERIOD = {0} AND D2.NameCode = 2", SelectPeriod);
......
519 533
                                    , CommonMotions.cnvString(objGetArry[(int)DetilData.PersonName])            // 担当者名
520 534
                                    , CommonMotions.cnvInt(objGetArry[(int)DetilData.ConstructionCode])         // 工事番号
521 535
                                    , CommonMotions.cnvString(objGetArry[(int)DetilData.ConstrName])            // 工事名称
536
                                    , CommonMotions.cnvDate(objGetArry[(int)DetilData.OrderDate]).ToShortDateString()   // 受注日
522 537
                                    , CommonDefine.ProjectsStatus[ConstrStatus]                                 // 施工状態
523 538
                                    , OrdersDecisionPrice.ToString("#,0")                                       // 受注金額
524 539
                                    , (OrdersDecisionPrice * ExpensesRaito1).ToString("#,0")                    // 会社経費
......
1015 1030
            }
1016 1031
        }
1017 1032
        #endregion
1033

  
1034
        #region 行選択色
1035
        /// <summary>
1036
        /// 行を選択色にする
1037
        /// </summary>
1038
        /// <param name="CurrentRow"></param>
1039
        private void SelectRowChangeColor(int CurrentRow)
1040
        {
1041
            try
1042
            {
1043
                DataGridView dgv = dgvMain;
1044
                DataGridViewRow CurRow = dgv.Rows[CurrentRow];
1045
                // カラム数
1046
                int colcnt = dgv.Columns.Count;
1047
                // 総合計は処理しない
1048
                if (CurRow.Cells[(int)GridColumn.DepartmentName].Style.BackColor == s_RowTotalBackColor) return;
1049

  
1050
                // 行の色を変える
1051
                for (int i = 0; i < colcnt; i++)
1052
                {
1053
                    dgv.Rows[m_BeforeGridRow].Cells[i].Style.ForeColor = s_RowSelectForeColor;
1054
                    dgv.Rows[m_BeforeGridRow].Cells[i].Style.BackColor = s_RowSelectBackColor;
1055
                }
1056
            }
1057
            catch (System.Exception ex)
1058
            {
1059
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1060
            }
1061
        }
1062
        #endregion
1063

  
1064
        // セル選択行
1065
        int m_BeforeGridRow = -1;
1066
        #region セル選択変更
1067
        /// <summary>
1068
        /// セル変更時行の色を変える
1069
        /// </summary>
1070
        /// <param name="sender"></param>
1071
        /// <param name="e"></param>
1072
        private void dgvMain_SelectionChanged(object sender, EventArgs e)
1073
        {
1074
            DataGridView dgv = dgvMain;
1075
            // 行選択色を元に戻す
1076
            if (m_BeforeGridRow != -1) DefaultRowChangeColor(m_BeforeGridRow);
1077

  
1078
            // 選択行数を退避
1079
            m_BeforeGridRow = dgv.CurrentRow.Index;
1080
            // 行選択色を設定
1081
            SelectRowChangeColor(m_BeforeGridRow);
1082
        }
1083
        #endregion
1084

  
1085
        #region 行デフォルト色
1086
        /// <summary>
1087
        /// 行をデフォルト色にする
1088
        /// </summary>
1089
        /// <param name="BeforeGridRow"></param>
1090
        private void DefaultRowChangeColor(int CurrentRow)
1091
        {
1092
            try
1093
            {
1094
                DataGridView dgv = dgvMain;
1095
                DataGridViewRow CurRow = dgv.Rows[CurrentRow];
1096
                // 行の色を変える
1097
                for (int i = 0; i < dgv.Columns.Count; i++)
1098
                {
1099
                    CurRow.Cells[i].Style.BackColor = Color.White;
1100
                    CurRow.Cells[i].Style.ForeColor = Color.Black;
1101
                }
1102
            }
1103
            catch (System.Exception ex)
1104
            {
1105
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1106
            }
1107
        }
1108
        #endregion
1018 1109
    }
1019 1110
}
branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmPriceOfBudget.resx
117 117
  <resheader name="writer">
118 118
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119 119
  </resheader>
120
  <metadata name="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
120
  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
121 121
    <value>True</value>
122 122
  </metadata>
123
  <metadata name="Column14.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
123
  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
124 124
    <value>True</value>
125 125
  </metadata>
126
  <metadata name="dataGridViewTextBoxColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
126
  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
127 127
    <value>True</value>
128 128
  </metadata>
129
  <metadata name="dataGridViewTextBoxColumn3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
129
  <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
130 130
    <value>True</value>
131 131
  </metadata>
132
  <metadata name="dataGridViewTextBoxColumn4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
132
  <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
133 133
    <value>True</value>
134 134
  </metadata>
135
  <metadata name="Column15.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
135
  <metadata name="Column6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
136 136
    <value>True</value>
137 137
  </metadata>
138
  <metadata name="dataGridViewTextBoxColumn5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
138
  <metadata name="Column7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
139 139
    <value>True</value>
140 140
  </metadata>
141
  <metadata name="dataGridViewTextBoxColumn6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
141
  <metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
142 142
    <value>True</value>
143 143
  </metadata>
144
  <metadata name="Column7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
144
  <metadata name="Column9.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
145 145
    <value>True</value>
146 146
  </metadata>
147
  <metadata name="Column8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
147
  <metadata name="Column10.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
148 148
    <value>True</value>
149 149
  </metadata>
150
  <metadata name="Column11.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
151
    <value>True</value>
152
  </metadata>
150 153
</root>
branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs
993 993
                // タブコントロールクラス初期化
994 994
                m_tabManager = new TabPageManager(tabMenu);
995 995

  
996
                // ********** 担当者承認を未実装のため非表示にする ***********
997
                //m_tabManager.ChangeTabPageVisible((int)MenuTabAssign.PersonApproval, false);
996
                // コントロール初期値取得
997
                SetInitObject();
998 998

  
999 999
                // システムログイン
1000 1000
                if (LoginAction() == DialogResult.No)
......
1010 1010
                // サブフォームハンドルリスト初期化
1011 1011
                InitSubFormHandleList();
1012 1012

  
1013
                // コントロール初期値取得
1014
                SetInitObject();
1015

  
1016 1013
                // 初期化フラグOFF
1017 1014
                m_bInitFlg = false;
1018 1015
            }
......
1114 1111
        {
1115 1112
            try
1116 1113
            {
1117
                if (this.WindowState == FormWindowState.Minimized)
1118
                {
1119
                    // 最小化
1120
                }
1121
                else if (this.WindowState == FormWindowState.Maximized)
1122
                {
1123
                    // 最大化
1124
                    CellSizeChangesWhenChangingScreenSize(false);
1125
                }
1126
                else if (this.WindowState == FormWindowState.Normal)
1127
                {
1128
                    // 標準化
1129
                    CellSizeChangesWhenChangingScreenSize(true);
1130
                }
1114

  
1131 1115
            }
1132 1116
            catch (Exception ex)
1133 1117
            {
branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs
141 141

  
142 142
                string wrkname = tabMenu.SelectedTab.Name;
143 143
                int Tabcount = MenuTabName[wrkname];
144

  
145
                // グリッドセルを画面サイズに合わせる
146
                if (m_Alldgv[Tabcount] != null)
147
                {
148
                    bool bNormal = false;
149

  
150
                    if (this.WindowState == FormWindowState.Maximized) bNormal = false;     // 最大化
151
                    else if (this.WindowState == FormWindowState.Normal) bNormal = true;    // 通常サイズ
152

  
153
                    // ----- グリッドのサイズを変更する
154
                    TabPageSizeChange(tabMenu.SelectedTab, bNormal);
155
                }
156
                
144 157
                switch (Tabcount)
145 158
                {
146 159
                    case (int)TabNameEnum.MessageBoard:
......
1226 1239
        }
1227 1240
        #endregion
1228 1241

  
1229
        #region 画面サイズ変更時
1242
        #region タブページグリッドセルサイス変更処理
1230 1243
        /// <summary>
1231
        /// 画面サイズ変更時のセルサイズ変更
1244
        /// タブページグリッドセルサイス変更処理
1232 1245
        /// </summary>
1233
        private void CellSizeChangesWhenChangingScreenSize(bool bNormal = true)
1246
        private void TabPageSizeChange(TabPage wrkPage, bool bNormal)
1234 1247
        {
1235 1248
            try
1236 1249
            {
1237 1250
                int idifference = 0;
1238 1251

  
1239
                foreach (TabPage wrkPage in tabMenu.TabPages)
1240
                {
1241
                    string wrkname = wrkPage.Name;
1242
                    int Tabcount = MenuTabName[wrkname] - 1;
1252
                string wrkname = wrkPage.Name;
1253
                int Tabcount = MenuTabName[wrkname] - 1;
1243 1254

  
1244
                    if (m_Alldgv[Tabcount] == null) continue;
1255
                if (m_Alldgv[Tabcount] == null) return;
1245 1256

  
1246
                    // 人員配置は処理しない
1247
                    if (Tabcount == (int)MenuTabAssign.StaffAssignment) continue;
1257
                // 人員配置は処理しない
1258
                if (Tabcount == (int)MenuTabAssign.StaffAssignment) return;
1248 1259

  
1249
                    // ----- グリッドのサイズを変更する
1250
                    if (m_GridWidthSize[Tabcount] < 0) continue;
1260
                // ----- グリッドのサイズを変更する
1261
                if (m_GridWidthSize[Tabcount] < 0) return;
1251 1262

  
1252
                    // 最大化の場合
1253
                    if (!bNormal)
... 差分の行数が表示可能な上限を超えました。超過分は表示しません。

他の形式にエクスポート: Unified diff